gnome-keyring r1154 - in trunk: . daemon keyrings pkcs11

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Jun 29 13:19:03 2008
New Revision: 1154
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1154&view=rev

Log:
	* 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



Modified:
   trunk/ChangeLog
   trunk/daemon/gkr-daemon-ops.c
   trunk/keyrings/gkr-keyrings.c
   trunk/pkcs11/gkr-pkcs11-calls.h
   trunk/pkcs11/gkr-pkcs11-daemon.c
   trunk/pkcs11/gkr-pkcs11-module.c

Modified: trunk/daemon/gkr-daemon-ops.c
==============================================================================
--- trunk/daemon/gkr-daemon-ops.c	(original)
+++ trunk/daemon/gkr-daemon-ops.c	Sun Jun 29 13:19:03 2008
@@ -1030,7 +1030,7 @@
                    GkrKeyringRequest *req)
 {
 	char *keyring_name;
-	GkrKeyring *keyring;
+	GkrKeyring *keyring = NULL;
 	GnomeKeyringOpCode opcode;
 	GnomeKeyringResult res;
 	

Modified: trunk/keyrings/gkr-keyrings.c
==============================================================================
--- trunk/keyrings/gkr-keyrings.c	(original)
+++ trunk/keyrings/gkr-keyrings.c	Sun Jun 29 13:19:03 2008
@@ -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"))
 

Modified: trunk/pkcs11/gkr-pkcs11-calls.h
==============================================================================
--- trunk/pkcs11/gkr-pkcs11-calls.h	(original)
+++ trunk/pkcs11/gkr-pkcs11-calls.h	Sun Jun 29 13:19:03 2008
@@ -156,7 +156,7 @@
 #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)
 

Modified: trunk/pkcs11/gkr-pkcs11-daemon.c
==============================================================================
--- trunk/pkcs11/gkr-pkcs11-daemon.c	(original)
+++ trunk/pkcs11/gkr-pkcs11-daemon.c	Sun Jun 29 13:19:03 2008
@@ -37,6 +37,7 @@
 #include <sys/un.h>
 #include <errno.h>
 #include <unistd.h>
+#include <string.h>
 
 #ifdef _DEBUG
 #include <assert.h>

Modified: trunk/pkcs11/gkr-pkcs11-module.c
==============================================================================
--- trunk/pkcs11/gkr-pkcs11-module.c	(original)
+++ trunk/pkcs11/gkr-pkcs11-module.c	Sun Jun 29 13:19:03 2008
@@ -44,6 +44,7 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 
 /* TODO: module fini should call finalize_common */