summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-03-25 09:07:52 +1100
committerDamien Miller <djm@mindrot.org>2003-03-25 09:07:52 +1100
commit68d893dfed6d29c92410296c19f425c95fe9fbb8 (patch)
treedc1a1e0cf23b83858254ea71033c282e6f12bd73
parent62b6b17080f24da1513e41e426064fdc2e53cf23 (diff)
- (djm) Fix getpeerid support for 64 bit BE systems. From
Arnd Bergmann <arndb@de.ibm.com>
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/bsd-getpeereid.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index baba423e..26e174cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20030325
+ - (djm) Fix getpeerid support for 64 bit BE systems. From
+ Arnd Bergmann <arndb@de.ibm.com>
+
20030324
- (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/03/23 19:02:00
@@ -1248,4 +1252,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2640 2003/03/24 02:35:58 djm Exp $
+$Id: ChangeLog,v 1.2641 2003/03/24 22:07:52 djm Exp $
diff --git a/openbsd-compat/bsd-getpeereid.c b/openbsd-compat/bsd-getpeereid.c
index c7876823..bcda2c15 100644
--- a/openbsd-compat/bsd-getpeereid.c
+++ b/openbsd-compat/bsd-getpeereid.c
@@ -24,7 +24,7 @@
#include "includes.h"
-RCSID("$Id: bsd-getpeereid.c,v 1.1 2002/09/12 00:33:02 djm Exp $");
+RCSID("$Id: bsd-getpeereid.c,v 1.2 2003/03/24 22:07:52 djm Exp $");
#if !defined(HAVE_GETPEEREID)
@@ -33,7 +33,7 @@ int
getpeereid(int s, uid_t *euid, gid_t *gid)
{
struct ucred cred;
- size_t len = sizeof(cred);
+ socklen_t len = sizeof(cred);
if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &cred, &len) < 0)
return (-1);