ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

pullup:

Browse Source 
382.   [bug]           named -u failed on many Linux systems where the
                        libc provided kernel headers do not match
                        the current kernel.
This commit is contained in:
Andreas Gustafsson
2000-08-15 00:20:57 +00:00
parent 307675483e
commit b19de3a81e
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -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 ---

25
bin/named/unix/os.c
View File

@@ -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