1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
--- usr/lib/pkcs11/cca_stdll/new_host.c.orig 2010-07-29 21:28:41.000000000 +0900
+++ usr/lib/pkcs11/cca_stdll/new_host.c 2010-10-20 00:06:26.575983974 +0900
@@ -298,7 +298,7 @@
struct group *grp;
int rc = 0;
gid_t gid,egid;
- grp = getgrnam("pkcs11");
+ grp = getgrnam(PKCS11GROUP);
if (grp) {
// Check for member of group..
// SAB get login seems to not work with some
@@ -786,7 +786,19 @@
//
object_mgr_destroy_token_objects();
#if 0 /* TODO: Implement delete_all_files_in_dir() */
+#if HAVE_ASPRINTF
local_rc = asprintf(&pk_full_path, "%s/%s", pk_dir, PK_LITE_OBJ_DIR);
+#else
+ pk_full_path = malloc(1024);
+ if( pk_full_path != NULL ) {
+ local_rc = snprintf(pk_full_path, 1023, "%s/%s",
+ pk_dir, PK_LITE_OBJ_DIR);
+ if( local_rc == -1 ) free(pk_full_path);
+ }
+ else {
+ local_rc = -1;
+ }
+#endif
if (local_rc == -1) {
rc = CKR_HOST_MEMORY;
goto out;
@@ -797,8 +809,20 @@
goto out;
}
#endif
+#if HAVE_ASPRINTF
local_rc = asprintf(&s, "%s %s/%s/* > /dev/null 2>&1", DEL_CMD, pk_dir,
PK_LITE_OBJ_DIR);
+#else
+ s = malloc(1024);
+ if( s != NULL ) {
+ local_rc = snprintf(s, 1023, "%s %s/%s/* > /dev/null 2>&1",
+ DEL_CMD, pk_dir, PK_LITE_OBJ_DIR);
+ if( local_rc == -1 ) free(s);
+ }
+ else {
+ local_rc = -1;
+ }
+#endif
if (local_rc == -1) {
rc = CKR_HOST_MEMORY;
goto out;
|
