diff options
author | Damien Miller <djm@mindrot.org> | 2003-03-25 09:07:52 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-03-25 09:07:52 +1100 |
commit | 68d893dfed6d29c92410296c19f425c95fe9fbb8 (patch) | |
tree | dc1a1e0cf23b83858254ea71033c282e6f12bd73 | |
parent | 62b6b17080f24da1513e41e426064fdc2e53cf23 (diff) |
- (djm) Fix getpeerid support for 64 bit BE systems. From
Arnd Bergmann <arndb@de.ibm.com>
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/bsd-getpeereid.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20030325 | ||
2 | - (djm) Fix getpeerid support for 64 bit BE systems. From | ||
3 | Arnd Bergmann <arndb@de.ibm.com> | ||
4 | |||
1 | 20030324 | 5 | 20030324 |
2 | - (djm) OpenBSD CVS Sync | 6 | - (djm) OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2003/03/23 19:02:00 | 7 | - markus@cvs.openbsd.org 2003/03/23 19:02:00 |
@@ -1248,4 +1252,4 @@ | |||
1248 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1252 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1249 | ok provos@ | 1253 | ok provos@ |
1250 | 1254 | ||
1251 | $Id: ChangeLog,v 1.2640 2003/03/24 02:35:58 djm Exp $ | 1255 | $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 c7876823d..bcda2c155 100644 --- a/openbsd-compat/bsd-getpeereid.c +++ b/openbsd-compat/bsd-getpeereid.c | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | RCSID("$Id: bsd-getpeereid.c,v 1.1 2002/09/12 00:33:02 djm Exp $"); | 27 | RCSID("$Id: bsd-getpeereid.c,v 1.2 2003/03/24 22:07:52 djm Exp $"); |
28 | 28 | ||
29 | #if !defined(HAVE_GETPEEREID) | 29 | #if !defined(HAVE_GETPEEREID) |
30 | 30 | ||
@@ -33,7 +33,7 @@ int | |||
33 | getpeereid(int s, uid_t *euid, gid_t *gid) | 33 | getpeereid(int s, uid_t *euid, gid_t *gid) |
34 | { | 34 | { |
35 | struct ucred cred; | 35 | struct ucred cred; |
36 | size_t len = sizeof(cred); | 36 | socklen_t len = sizeof(cred); |
37 | 37 | ||
38 | if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &cred, &len) < 0) | 38 | if (getsockopt(s, SOL_SOCKET, SO_PEERCRED, &cred, &len) < 0) |
39 | return (-1); | 39 | return (-1); |