diff options
author | Damien Miller <djm@mindrot.org> | 2003-03-26 16:02:47 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-03-26 16:02:47 +1100 |
commit | c0d2468298d069cb0d234a4b1b9465b8edc8e005 (patch) | |
tree | 7ffc9fdab7e53fe904c2bc7864f57e223b1200f0 | |
parent | 63e2615c137bde9587954d7947b5319c3b4d5f31 (diff) |
- (djm) Fix getpeerid support for 64 bit BE systems. From
Arnd Bergmann <arndb@de.ibm.com>
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | openbsd-compat/bsd-getpeereid.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -4,6 +4,8 @@ | |||
4 | [sftp-server.c] | 4 | [sftp-server.c] |
5 | one last fix to the tree: race fix broke stuff; pr 3169; | 5 | one last fix to the tree: race fix broke stuff; pr 3169; |
6 | srp@srparish.net, help from djm | 6 | srp@srparish.net, help from djm |
7 | - (djm) Fix getpeerid support for 64 bit BE systems. From | ||
8 | Arnd Bergmann <arndb@de.ibm.com> | ||
7 | - Release 3.6p1 | 9 | - Release 3.6p1 |
8 | 10 | ||
9 | 20030324 | 11 | 20030324 |
@@ -1254,4 +1256,4 @@ | |||
1254 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1256 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1255 | ok provos@ | 1257 | ok provos@ |
1256 | 1258 | ||
1257 | $Id: ChangeLog,v 1.2633.2.7 2003/03/26 04:59:47 djm Exp $ | 1259 | $Id: ChangeLog,v 1.2633.2.8 2003/03/26 05:02:47 djm Exp $ |
diff --git a/openbsd-compat/bsd-getpeereid.c b/openbsd-compat/bsd-getpeereid.c index c7876823d..3f554e72a 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.1.4.1 2003/03/26 05:02:47 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); |