pullup:

 382.   [bug]           named -u failed on many Linux systems where the
                        libc provided kernel headers do not match
                        the current kernel.

diff --git a/CHANGES b/CHANGES
index d9155f58440b40c3e436352e9c0bc2b5b5c6ac75..9c4d97f5e83d5b5d3f447d786f82d5b9e7e5b60c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@
  386.  [bug]           Missing strdup() of ACL name caused random
                        ACL matching failures [RT #228].
 
+ 382.  [bug]           named -u failed on many Linux systems where the
+                       libc provided kernel headers do not match
+                       the current kernel.
+
  380.  [bug]           nsupdate didn't work with IPv6.
 
        --- 9.0.0rc2 released ---

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index cfe6e01a9c759172cb97de9840660d30c23724f1..7fee42c99b40a5a0582fc6837efd1ab74e731c76 100644 (file)
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: os.c,v 1.18.2.2 2000/07/10 21:35:38 gson Exp $ */
+/* $Id: os.c,v 1.18.2.3 2000/08/15 00:20:57 gson Exp $ */
 
 #include <config.h>
 
@@ -61,8 +61,19 @@ static isc_boolean_t done_setuid = ISC_FALSE;
 
 #ifdef HAVE_LINUX_PRCTL_H
 #include <sys/prctl.h>         /* Required for prctl(). */
+
+/*
+ * If the value of PR_SET_KEEPCAPS is not in <linux/prctl.h>, define it
+ * here.  This allows setuid() to work on systems running a new enough
+ * kernel but with /usr/include/linux pointing to "standard" kernel
+ * headers.
+ */
+#ifndef PR_SET_KEEPCAPS
+#define PR_SET_KEEPCAPS 8
 #endif
 
+#endif /* HAVE_LINUX_PRCTL_H */
+
 #ifndef SYS_capset
 #define SYS_capset __NR_capset
 #endif
@@ -108,14 +119,10 @@ linux_initialprivs(void) {
         */
        caps |= (1 << CAP_SYS_CHROOT);
 
-#if defined(HAVE_LINUX_PRCTL_H) && defined(PR_SET_KEEPCAPS)
+#ifdef HAVE_LINUX_PRCTL_H
        /*
         * If the kernel supports keeping capabilities after setuid(), we
-        * also want the setuid capability.
-        *
-        * There's no point turning this on if we don't have PR_SET_KEEPCAPS,
-        * because changing user ids only works right with linuxthreads if
-        * we can do it early (before creating threads).
+        * also want the setuid capability.  We don't know until we've tried.
         */
        caps |= (1 << CAP_SETUID);
 #endif
@@ -151,7 +158,7 @@ linux_minprivs(void) {
        linux_setcaps(caps);
 }
 
-#if defined(HAVE_LINUX_PRCTL_H) && defined(PR_SET_KEEPCAPS)
+#ifdef HAVE_LINUX_PRCTL_H
 static void
 linux_keepcaps(void) {
        /*
@@ -310,7 +317,7 @@ ns_os_changeuser(void) {
 void
 ns_os_minprivs(void) {
 #ifdef HAVE_LINUX_CAPABILITY_H
-#if defined(HAVE_LINUX_PRCTL_H) && defined(PR_SET_KEEPCAPS)
+#ifdef HAVE_LINUX_PRCTL_H
        linux_keepcaps();
        ns_os_changeuser();
 #endif