Try and fix the autoconf build on Solaris/Nexenta/etc.

Their AC_TRY_RUN doesn't include any current CPPFLAGS. Make
the set[res]uid checks independent of this. Needs a small
change to the waf build in order to code with the change.

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Jun 30 00:32:36 CEST 2012 on sn-devel-104

diff --git a/lib/util/setid.c b/lib/util/setid.c
index 66c06397ee6570c66230d6c7f58b8b80434f4fb0..885b8bf18683830820cfc9fdae02ead614e99c2d 100644 (file)
--- a/lib/util/setid.c
+++ b/lib/util/setid.c
@@ -64,11 +64,42 @@ int samba_setgid(gid_t gid);
 int samba_setuidx(int flags, uid_t uid);
 int samba_setgidx(int flags, gid_t gid);
 int samba_setgroups(size_t setlen, const gid_t *gidset);
+#endif
+
+#include "../lib/util/setid.h"
 
+#else
+
+/* Inside autoconf test. */
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
 #endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+
+#ifdef HAVE_SYS_PRIV_H
+#include <sys/priv.h>
+#endif
+#ifdef HAVE_SYS_ID_H
+#include <sys/id.h>
 #endif
 
-#include "../lib/util/setid.h"
+/* autoconf tests don't include setid.h */
+int samba_setresuid(uid_t ruid, uid_t euid, uid_t suid);
+int samba_setresgid(gid_t rgid, gid_t egid, gid_t sgid);
+int samba_setreuid(uid_t ruid, uid_t euid);
+int samba_setregid(gid_t rgid, gid_t egid);
+int samba_seteuid(uid_t euid);
+int samba_setegid(gid_t egid);
+int samba_setuid(uid_t uid);
+int samba_setgid(gid_t gid);
+int samba_setuidx(int flags, uid_t uid);
+int samba_setgidx(int flags, gid_t gid);
+int samba_setgroups(size_t setlen, const gid_t *gidset);
+
+#endif
 
 #if defined(USE_LINUX_THREAD_CREDENTIALS)
 #if defined(HAVE_SYSCALL_H)

diff --git a/source3/configure.in b/source3/configure.in
index 483072f0f5074f76d5a8edb56b6ee917cbb58169..a9640d87e351938ce3ff15555ef0714915b66bfc 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2773,7 +2773,7 @@ AC_CACHE_CHECK([for Linux thread-specific credentials],samba_cv_USE_LINUX_THREAD
 AC_TRY_RUN([
 #define AUTOCONF_TEST 1
 #define USE_LINUX_THREAD_CREDENTIALS 1
-#include "confdefs.h"
+#include "${srcdir-.}/../lib/util/setid.c"
 #include "${srcdir-.}/lib/util_sec.c"],
            samba_cv_USE_LINUX_THREAD_CREDENTIALS=yes,samba_cv_USE_LINUX_THREAD_CREDENTIALS=no,samba_cv_USE_LINUX_THREAD_CREDENTIALS=cross)])
 if test x"$samba_cv_USE_LINUX_THREAD_CREDENTIALS" = x"yes"; then
@@ -2789,6 +2789,7 @@ AC_TRY_RUN([
 #define AUTOCONF_TEST 1
 #define USE_SETREUID 1
 #include "confdefs.h"
+#include "${srcdir-.}/../lib/util/setid.c"
 #include "${srcdir-.}/lib/util_sec.c"],
            samba_cv_USE_SETREUID=yes,samba_cv_USE_SETREUID=no,samba_cv_USE_SETREUID=cross)])
 if test x"$samba_cv_USE_SETREUID" = x"yes"; then
@@ -2804,6 +2805,7 @@ AC_TRY_RUN([
 #define AUTOCONF_TEST 1
 #define USE_SETRESUID 1
 #include "confdefs.h"
+#include "${srcdir-.}/../lib/util/setid.c"
 #include "${srcdir-.}/lib/util_sec.c"],
            samba_cv_USE_SETRESUID=yes,samba_cv_USE_SETRESUID=no,samba_cv_USE_SETRESUID=cross)])
 if test x"$samba_cv_USE_SETRESUID" = x"yes"; then
@@ -2817,6 +2819,7 @@ AC_TRY_RUN([
 #define AUTOCONF_TEST 1
 #define USE_SETEUID 1
 #include "confdefs.h"
+#include "${srcdir-.}/../lib/util/setid.c"
 #include "${srcdir-.}/lib/util_sec.c"],
            samba_cv_USE_SETEUID=yes,samba_cv_USE_SETEUID=no,samba_cv_USE_SETEUID=cross)])
 if test x"$samba_cv_USE_SETEUID" = x"yes"; then
@@ -2830,6 +2833,7 @@ AC_TRY_RUN([
 #define AUTOCONF_TEST 1
 #define USE_SETUIDX 1
 #include "confdefs.h"
+#include "${srcdir-.}/../lib/util/setid.c"
 #include "${srcdir-.}/lib/util_sec.c"],
            samba_cv_USE_SETUIDX=yes,samba_cv_USE_SETUIDX=no,samba_cv_USE_SETUIDX=cross)])
 if test x"$samba_cv_USE_SETUIDX" = x"yes"; then

diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c
index cee11d9f9604c92ace3716a10c396140597b4bb6..11d85a102a554687f733311395e61e7c7c98408f 100644 (file)
--- a/source3/lib/util_sec.c
+++ b/source3/lib/util_sec.c
@@ -40,9 +40,6 @@
 #include <sys/id.h>
 #endif
 
-/* In autoconf/test mode include the definitions of samba_setXXX. */
-#include "../lib/util/setid.c"
-
 #define DEBUG(x, y) printf y
 #define smb_panic(x) exit(1)
 #define bool int

diff --git a/source3/wscript b/source3/wscript
index 449bf20e057a0622940f08a2507fc1398e1c90b8..cc05095c2520052d4972671b228f7c725fa47684 100755 (executable)
--- a/source3/wscript
+++ b/source3/wscript
@@ -733,6 +733,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_LINUX_THREAD_CREDENTIALS 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_LINUX_THREAD_CREDENTIALS',
@@ -743,6 +744,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETREUID 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETREUID',
@@ -753,6 +755,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETRESUID 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETRESUID',
@@ -763,6 +766,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETEUID 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETEUID',
@@ -773,6 +777,7 @@ int i; i = PAM_RADIO_TYPE;
         seteuid = conf.CHECK_CODE('''
                                 #define AUTOCONF_TEST 1
                                 #define USE_SETUIDX 1
+                                #include "../lib/util/setid.c"
                                 #include "./lib/util_sec.c"
                                 ''',
                                 'USE_SETUIDX',