- (djm) Fix getpeerid support for 64 bit BE systems. From

    Arnd Bergmann <arndb@de.ibm.com>

diff --git a/ChangeLog b/ChangeLog
index eae68464d9650768673776db34587647028d15e8..cdcd73df3ebc0defd430ca0619e03d9ef9f2c41e 100644 (file)
--- 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 c7876823de2cc8b8d427b12e74396bd32315068d..3f554e72ac61e93ed1d60b8a346455f485fd9a86 100644 (file)
--- 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);