QNX bootstrap vs issetugid()

[Sean Boudreau <seanb%qnx.com@localhost>]

Hi:

Looks like something in the pkg_admin utility is now
bringing in some libnbcompat/db funcs that reference
issetugid().  Here's a suggested diff.

-seanb


Index: pkgtools/libnbcompat/files/configure.ac
===================================================================
--- pkgtools/libnbcompat/files/configure.ac     (revision 131)
+++ pkgtools/libnbcompat/files/configure.ac     (working copy)
@@ -373,6 +373,12 @@
 
 AC_CHECK_FUNC(getpgrp, [AC_FUNC_GETPGRP])
 
+need_issetugid=no
+AC_CHECK_FUNCS([issetugid], [:], [ issetugid=yes ])
+if test $issetugid = yes; then
+       AC_LIBOBJ(issetugid)
+fi
+
 AC_CHECK_MEMBERS([struct statfs.f_flags], [:], [:],
        [ #include <sys/statfs.h> ])
 AC_CHECK_MEMBERS([struct statfs.f_fsize], [:], [:],
Index: pkgtools/libnbcompat/files/issetugid.c
===================================================================
--- pkgtools/libnbcompat/files/issetugid.c      (revision 0)
+++ pkgtools/libnbcompat/files/issetugid.c      (revision 0)
@@ -0,0 +1,16 @@
+
+#include <nbcompat.h>
+
+#include <unistd.h>
+
+#ifndef HAVE_ISSETUGID
+int
+issetugid(void)
+{
+       if (getuid() != geteuid() ||
+           getgid() != getegid()) {
+               return 1;
+       }
+       return 0;
+}
+#endif /* !HAVE_ISSETUGID */
Index: pkgtools/libnbcompat/files/configure
===================================================================
--- pkgtools/libnbcompat/files/configure        (revision 131)
+++ pkgtools/libnbcompat/files/configure        (working copy)
@@ -12814,6 +12814,118 @@
 fi
 
 
+need_issetugid=no
+
+for ac_func in issetugid
+do
+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+$as_echo_n "checking for $ac_func... " >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares 
$ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+        test -z "$ac_c_werror_flag" ||
+        test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+        test "$cross_compiling" = yes ||
+        $as_test_x conftest$ac_exeext
+       }; then
+  eval "$as_ac_var=yes"
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       eval "$as_ac_var=no"
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'`
+              { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if test `eval 'as_val=${'$as_ac_var'}
+                $as_echo "$as_val"'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+ :
+else
+   issetugid=yes
+fi
+done
+
+if test $issetugid = yes; then
+       case " $LIBOBJS " in
+  *" issetugid.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS issetugid.$ac_objext"
+ ;;
+esac
+
+fi
+
 { $as_echo "$as_me:$LINENO: checking for struct statfs.f_flags" >&5
 $as_echo_n "checking for struct statfs.f_flags... " >&6; }
 if test "${ac_cv_member_struct_statfs_f_flags+set}" = set; then
Index: pkgtools/libnbcompat/files/nbcompat/config.h.in
===================================================================
--- pkgtools/libnbcompat/files/nbcompat/config.h.in     (revision 131)
+++ pkgtools/libnbcompat/files/nbcompat/config.h.in     (working copy)
@@ -136,6 +136,9 @@
 /* Define to 1 if you have the `isblank' function. */
 #undef HAVE_ISBLANK
 
+/* Define to 1 if you have the `issetugid' function. */
+#undef HAVE_ISSETUGID
+
 /* Define to 1 if you have the `lchflags' function. */
 #undef HAVE_LCHFLAGS
 
@@ -145,6 +148,12 @@
 /* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 
+/* Define to 1 if you have the `nsl' library (-lnsl). */
+#undef HAVE_LIBNSL
+
+/* Define to 1 if you have the `socket' library (-lsocket). */
+#undef HAVE_LIBSOCKET
+
 /* Define to 1 if you have the `util' library (-lutil). */
 #undef HAVE_LIBUTIL