diff options
| author | Stefan Walter <stefw@src.gnome.org> | 2008-06-29 13:19:03 +0000 |
|---|---|---|
| committer | Stefan Walter <stefw@src.gnome.org> | 2008-06-29 13:19:03 +0000 |
| commit | f9bcc54f25f045111b59668425740bef9a0529a8 (patch) | |
| tree | b4441bd826af29d9bb40ffed1913a0a724b4a94e | |
| parent | 06f55aa468b14bb31e37b3c3daf87224e8f65b37 (diff) | |
| download | gnome-keyring-f9bcc54f25f045111b59668425740bef9a0529a8.tar.gz | |
Fix build issues on Mac OS X See bug #535859. Patch by John Ralls
* keyrings/gkr-keyrings.c:
* pkcs11/gkr-pkcs11-module.c:
* pkcs11/gkr-pkcs11-daemon.c:
* pkcs11/gkr-pkcs11-calls.h:
* daemon/gkr-daemon-ops.c: Fix build issues on Mac OS X
See bug #535859. Patch by John Ralls
svn path=/trunk/; revision=1154
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | daemon/gkr-daemon-ops.c | 2 | ||||
| -rw-r--r-- | keyrings/gkr-keyrings.c | 1 | ||||
| -rw-r--r-- | pkcs11/gkr-pkcs11-calls.h | 2 | ||||
| -rw-r--r-- | pkcs11/gkr-pkcs11-daemon.c | 1 | ||||
| -rw-r--r-- | pkcs11/gkr-pkcs11-module.c | 1 |
6 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,12 @@ +2008-06-29 Stef Walter <stef@memberwebs.com> + + * keyrings/gkr-keyrings.c: + * pkcs11/gkr-pkcs11-module.c: + * pkcs11/gkr-pkcs11-daemon.c: + * pkcs11/gkr-pkcs11-calls.h: + * daemon/gkr-daemon-ops.c: Fix build issues on Mac OS X + See bug #535859. Patch by John Ralls + 2008-06-21 Stef Walter <stef@memberwebs.com> * daemon/gkr-daemon.c: Initialize random number generator diff --git a/daemon/gkr-daemon-ops.c b/daemon/gkr-daemon-ops.c index 49021b79..9d38fdb3 100644 --- a/daemon/gkr-daemon-ops.c +++ b/daemon/gkr-daemon-ops.c @@ -1030,7 +1030,7 @@ op_delete_keyring (GkrBuffer *packet, GkrBuffer *result, GkrKeyringRequest *req) { char *keyring_name; - GkrKeyring *keyring; + GkrKeyring *keyring = NULL; GnomeKeyringOpCode opcode; GnomeKeyringResult res; diff --git a/keyrings/gkr-keyrings.c b/keyrings/gkr-keyrings.c index 0210846f..c4c36909 100644 --- a/keyrings/gkr-keyrings.c +++ b/keyrings/gkr-keyrings.c @@ -42,6 +42,7 @@ #include <sys/un.h> #include <sys/stat.h> #include <glib.h> +#include <strings.h> #define LOC_DEFAULT_FILE (gkr_location_from_string ("LOCAL:/keyrings/default")) diff --git a/pkcs11/gkr-pkcs11-calls.h b/pkcs11/gkr-pkcs11-calls.h index 94bd0eec..006a39b8 100644 --- a/pkcs11/gkr-pkcs11-calls.h +++ b/pkcs11/gkr-pkcs11-calls.h @@ -156,7 +156,7 @@ const static GkrPkcs11CallInfo gkr_pkcs11_calls[] = { #endif #define GKR_PKCS11_HANDSHAKE \ - ("PRIVATE-GNOME-KEYRING-PKCS11-PROTOCOL-V-" VERSION) + ("PRIVATE-GNOME-KEYRING-PKCS11-PROTOCOL-V-1") #define GKR_PKCS11_HANDSHAKE_LEN \ (sizeof (GKR_PKCS11_HANDSHAKE) - 1) diff --git a/pkcs11/gkr-pkcs11-daemon.c b/pkcs11/gkr-pkcs11-daemon.c index a9482136..7eb53fd9 100644 --- a/pkcs11/gkr-pkcs11-daemon.c +++ b/pkcs11/gkr-pkcs11-daemon.c @@ -37,6 +37,7 @@ #include <sys/un.h> #include <errno.h> #include <unistd.h> +#include <string.h> #ifdef _DEBUG #include <assert.h> diff --git a/pkcs11/gkr-pkcs11-module.c b/pkcs11/gkr-pkcs11-module.c index bf9245bd..4ebcc7b5 100644 --- a/pkcs11/gkr-pkcs11-module.c +++ b/pkcs11/gkr-pkcs11-module.c @@ -44,6 +44,7 @@ #include <errno.h> #include <stdarg.h> #include <stdio.h> +#include <string.h> /* TODO: module fini should call finalize_common */ |