summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Walter <stefw@src.gnome.org>2008-06-29 13:24:49 +0000
committerStefan Walter <stefw@src.gnome.org>2008-06-29 13:24:49 +0000
commit3b12f6fca382c0b61dc04a37683e243d7961c8bc (patch)
tree5021c424ca9d041412e2ec4bac8f0000b4d62ac3
parentf9bcc54f25f045111b59668425740bef9a0529a8 (diff)
downloadgnome-keyring-3b12f6fca382c0b61dc04a37683e243d7961c8bc.tar.gz
Fix build issues. See bug #540397. Patch by margali
* common/gkr-unix-credentials.c: Fix build issues. See bug #540397. Patch by margali svn path=/trunk/; revision=1155
-rw-r--r--ChangeLog3
-rw-r--r--common/gkr-unix-credentials.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4be6742f..960d5c89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2008-06-29 Stef Walter <stef@memberwebs.com>
+ * common/gkr-unix-credentials.c: Fix build issues.
+ See bug #540397. Patch by margali
+
* keyrings/gkr-keyrings.c:
* pkcs11/gkr-pkcs11-module.c:
* pkcs11/gkr-pkcs11-daemon.c:
diff --git a/common/gkr-unix-credentials.c b/common/gkr-unix-credentials.c
index d39a9344..3d0b4c7d 100644
--- a/common/gkr-unix-credentials.c
+++ b/common/gkr-unix-credentials.c
@@ -126,7 +126,7 @@ gkr_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
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 @@ gkr_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
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;