I love standards. There are so many to choose from. Except when there isn't one.

Linux and *BSD disagree on the elements within the ucred structure.  Detect
which one is in use on the system.

(closes issue #18384)
 Reported by: bjm
 Patches:
       cred-diffs uploaded by bjm (license 473)
       20101127__issue18384__1.6.2.diff.txt uploaded by tilghman (license 14)
       20101127__issue18384__1.8.diff.txt uploaded by tilghman (license 14)
 Tested by: tilghman, bjm

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@296533 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 47d67f9afd21955cc4febd3ee50bea1b5f5a728c..cf3406a3d0a2e33e52ec2aff39673fcd662963b3 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 290201 .
+# From configure.ac Revision: 294429 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for asterisk 1.6.2.
 #
@@ -11843,6 +11843,27 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
+fi
+
+ac_fn_c_check_member "$LINENO" "struct ucred" "uid" "ac_cv_member_struct_ucred_uid" "#include <sys/socket.h>
+"
+if test "x$ac_cv_member_struct_ucred_uid" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UCRED_UID 1
+_ACEOF
+
+
+fi
+ac_fn_c_check_member "$LINENO" "struct ucred" "cr_uid" "ac_cv_member_struct_ucred_cr_uid" "#include <sys/socket.h>
+"
+if test "x$ac_cv_member_struct_ucred_cr_uid" = x""yes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_UCRED_CR_UID 1
+_ACEOF
+
+
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5

diff --git a/configure.ac b/configure.ac
index 2d07c8c4a997aa81f5ae033392ac6d231251eada..8603f8673318080d6cb59e7e8daa2c526c93e41d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -392,6 +392,7 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_CHECK_MEMBERS([struct stat.st_blksize])
+AC_CHECK_MEMBERS([struct ucred.uid, struct ucred.cr_uid], [], [], [#include <sys/socket.h>])
 AC_HEADER_TIME
 AC_STRUCT_TM
 AC_C_VOLATILE

diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index e9ffe7bd91c1bf00d9b180c96e7975825b0d12c0..fd22a3f5c0ef4b7f95bda85376e621c4d9b44b86 100644 (file)
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -705,6 +705,12 @@
 /* Define to 1 if `st_blksize' is a member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
+/* Define to 1 if `cr_uid' is a member of `struct ucred'. */
+#undef HAVE_STRUCT_UCRED_CR_UID
+
+/* Define to 1 if `uid' is a member of `struct ucred'. */
+#undef HAVE_STRUCT_UCRED_UID
+
 /* Define to 1 if you have the mISDN Supplemental Services library. */
 #undef HAVE_SUPPSERV
 

diff --git a/main/asterisk.c b/main/asterisk.c
index 12025f5b9d7301d336cbe8904cea2c02f0fa27de..4c79aee6ca0522f150b6c18078e8e2753921b722 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -1193,12 +1193,18 @@ static int read_credentials(int fd, char *buffer, size_t size, struct console *c
                return result;
        }
 
-#if defined(SO_PEERCRED)
+#if defined(SO_PEERCRED) && (defined(HAVE_STRUCT_UCRED_UID) || defined(HAVE_STRUCT_UCRED_CR_UID))
        if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &len)) {
                return result;
        }
+#if defined(HAVE_STRUCT_UCRED_UID)
        uid = cred.uid;
        gid = cred.gid;
+#else /* defined(HAVE_STRUCT_UCRED_CR_UID) */
+       uid = cred.cr_uid;
+       gid = cred.cr_gid;
+#endif /* defined(HAVE_STRUCT_UCRED_UID) */
+
 #elif defined(HAVE_GETPEEREID)
        if (getpeereid(fd, &uid, &gid)) {
                return result;