Import ber_socklen_t (ITS#4629) from HEAD

[openldap] / libraries / liblutil / getpeereid.c

diff --git a/libraries/liblutil/getpeereid.c b/libraries/liblutil/getpeereid.c
index f1f5cc29ec525b5fe01117c50aeab45fc7395497..e856bf70546f4a8f6d118980d6463cf2d6bbf8ff 100644 (file)
--- a/libraries/liblutil/getpeereid.c
+++ b/libraries/liblutil/getpeereid.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2003 The OpenLDAP Foundation.
+ * Copyright 2000-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,8 +31,10 @@
 #include <sys/ucred.h>
 #endif
 
-#if !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \
-       defined(HAVE_SENDMSG) && defined(HAVE_MSGHDR_MSG_ACCRIGHTS)
+/* Disabled due to ITS#4893, will revisit in release 2.4 */
+#if 0 /* !defined(SO_PEERCRED) && !defined(LOCAL_PEERCRED) && \
+       defined(HAVE_SENDMSG) && (defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTSLEN) || \
+               defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)) */
 #define DO_SENDMSG
 #ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
@@ -40,12 +42,15 @@
 #include <sys/stat.h>
 #endif
 
+#include <stdlib.h>
+
+
 int getpeereid( int s, uid_t *euid, gid_t *egid )
 {
 #ifdef LDAP_PF_LOCAL
 #if defined( SO_PEERCRED )
        struct ucred peercred;
-       size_t peercredlen = sizeof peercred;
+       ber_socklen_t peercredlen = sizeof peercred;
 
        if(( getsockopt( s, SOL_SOCKET, SO_PEERCRED,
                (void *)&peercred, &peercredlen ) == 0 )
@@ -58,7 +63,7 @@ int getpeereid( int s, uid_t *euid, gid_t *egid )
 
 #elif defined( LOCAL_PEERCRED )
        struct xucred peercred;
-       socklen_t peercredlen = sizeof peercred;
+       ber_socklen_t peercredlen = sizeof peercred;
 
        if(( getsockopt( s, LOCAL_PEERCRED, 1,
                (void *)&peercred, &peercredlen ) == 0 )
@@ -69,25 +74,62 @@ int getpeereid( int s, uid_t *euid, gid_t *egid )
                return 0;
        }
 #elif defined( DO_SENDMSG )
-       int dummy, fd[2];
+       char dummy[8];
+       int err, fd[2];
        struct iovec iov;
        struct msghdr msg = {0};
+# ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
+# ifndef CMSG_SPACE
+# define CMSG_SPACE(len)       (_CMSG_ALIGN(sizeof(struct cmsghdr)) + _CMSG_ALIGN(len))
+# endif
+# ifndef CMSG_LEN
+# define CMSG_LEN(len)         (_CMSG_ALIGN(sizeof(struct cmsghdr)) + (len))
+# endif
+       union {
+               struct cmsghdr cm;
+               unsigned char control[CMSG_SPACE(sizeof(int))];
+       } control_un;
+       struct cmsghdr *cmsg;
+# endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL */
        struct stat st;
 
-       iov.iov_base = (char*) &dummy;
-       iov.iov_len = 1;
+       msg.msg_name = NULL;
+       msg.msg_namelen = 0;
+
+       iov.iov_base = dummy;
+       iov.iov_len = sizeof dummy;
        msg.msg_iov = &iov;
        msg.msg_iovlen = 1;
+# ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
+       msg.msg_control = control_un.control;
+       msg.msg_controllen = sizeof( control_un.control );
+
+       cmsg = CMSG_FIRSTHDR( &msg );
+
+       /*
+        * AIX returns a bogus file descriptor if recvmsg() is
+        * called with MSG_PEEK (is this a bug?). Hence we need
+        * to receive the Abandon PDU.
+        */
+       if( recvmsg( s, &msg, MSG_WAITALL ) >= 0 &&
+           cmsg->cmsg_len == CMSG_LEN( sizeof(int) ) &&
+           cmsg->cmsg_level == SOL_SOCKET &&
+           cmsg->cmsg_type == SCM_RIGHTS )
+# else
        msg.msg_accrights = (char *)fd;
        msg.msg_accrightslen = sizeof(fd);
        if( recvmsg( s, &msg, MSG_PEEK) >= 0 && msg.msg_accrightslen == sizeof(int) )
+# endif /* HAVE_STRUCT_MSGHDR_MSG_CONTROL*/
        {
                /* We must receive a valid descriptor, it must be a pipe,
                 * and it must only be accessible by its owner.
                 */
-               dummy = fstat( fd[0], &st );
+# ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
+               fd[0] = (*(int *)CMSG_DATA( cmsg ));
+# endif
+               err = fstat( fd[0], &st );
                close(fd[0]);
-               if( dummy == 0 && S_ISFIFO(st.st_mode) &&
+               if( err == 0 && S_ISFIFO(st.st_mode) &&
                        ((st.st_mode & (S_IRWXG|S_IRWXO)) == 0))
                {
                        *euid = st.st_uid;
@@ -95,6 +137,48 @@ int getpeereid( int s, uid_t *euid, gid_t *egid )
                        return 0;
                }
        }
+#elif defined(SOCKCREDSIZE)
+       struct msghdr msg;
+       ber_socklen_t crmsgsize;
+       void *crmsg;
+       struct cmsghdr *cmp;
+       struct sockcred *sc;
+
+       memset(&msg, 0, sizeof msg);
+       crmsgsize = CMSG_SPACE(SOCKCREDSIZE(NGROUPS));
+       if (crmsgsize == 0) goto sc_err;
+       crmsg = malloc(crmsgsize);
+       if (crmsg == NULL) goto sc_err;
+       memset(crmsg, 0, crmsgsize);
+       
+       msg.msg_control = crmsg;
+       msg.msg_controllen = crmsgsize;
+       
+       if (recvmsg(s, &msg, 0) < 0) {
+               free(crmsg);
+               goto sc_err;
+       }       
+
+       if (msg.msg_controllen == 0 || (msg.msg_flags & MSG_CTRUNC) != 0) {
+               free(crmsg);
+               goto sc_err;
+       }       
+       
+       cmp = CMSG_FIRSTHDR(&msg);
+       if (cmp->cmsg_level != SOL_SOCKET || cmp->cmsg_type != SCM_CREDS) {
+               printf("nocreds\n");
+               goto sc_err;
+       }       
+       
+       sc = (struct sockcred *)(void *)CMSG_DATA(cmp);
+       
+       *euid = sc->sc_euid;
+       *egid = sc->sc_egid;
+
+       free(crmsg);
+       return 0;
+
+sc_err:        
 #endif
 #endif /* LDAP_PF_LOCAL */