gnome-keyring r1155 - in trunk: . common

[nnielsen svn gnome org]

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

Log:
	* common/gkr-unix-credentials.c: Fix build issues. 
	See bug #540397. Patch by margali



Modified:
   trunk/ChangeLog
   trunk/common/gkr-unix-credentials.c

Modified: trunk/common/gkr-unix-credentials.c
==============================================================================
--- trunk/common/gkr-unix-credentials.c	(original)
+++ trunk/common/gkr-unix-credentials.c	Sun Jun 29 13:24:49 2008
@@ -126,7 +126,7 @@
 		cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
 		*pid = 0;
 		*uid = cred->sc_euid;
-		set_local_creds(sock, FALSE);
+		set_local_creds(sock, 0);
 #elif defined(HAVE_GETPEEREID) /* OpenBSD */
 		uid_t euid;
 		gid_t egid;
@@ -135,8 +135,8 @@
 		if (getpeereid (sock, &euid, &egid) == 0) {
 			*uid = euid;
 		} else {
-			g_warning ("getpeereid() failed: %s", strerror (errno));
-			return FALSE;
+			fprintf (stderr, "getpeereid() failed: %s\n", strerror (errno)); 
+			return -1;
 		}
 #elif defined(HAVE_GETPEERUCRED)
 		ucred_t *uc = NULL;