summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-03-26 16:02:47 +1100
committerDamien Miller <djm@mindrot.org>2003-03-26 16:02:47 +1100
commitc0d2468298d069cb0d234a4b1b9465b8edc8e005 (patch)
tree7ffc9fdab7e53fe904c2bc7864f57e223b1200f0
parent63e2615c137bde9587954d7947b5319c3b4d5f31 (diff)
- (djm) Fix getpeerid support for 64 bit BE systems. From
Arnd Bergmann <arndb@de.ibm.com>
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/bsd-getpeereid.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eae68464..cdcd73df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
[sftp-server.c]
one last fix to the tree: race fix broke stuff; pr 3169;
srp@srparish.net, help from djm
+ - (djm) Fix getpeerid support for 64 bit BE systems. From
+ Arnd Bergmann <arndb@de.ibm.com>
- Release 3.6p1
20030324
@@ -1254,4 +1256,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2633.2.7 2003/03/26 04:59:47 djm Exp $
+$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 c7876823..3f554e72 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.1.4.1 2003/03/26 05:02:47 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);