diff options
| author | Internet Software Consortium, Inc <@isc.org> | 2007-09-07 14:08:28 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2007-09-07 14:08:28 -0600 |
| commit | f96316d95bf0c04848031437a285934912c68b83 (patch) | |
| tree | 43a35de625fae164472c31dd9e369a885e5ec28f /bin/named/unix/os.c | |
| parent | 4089379c19b6316e701952cb731eda71c9cfd8bb (diff) | |
| download | bind9-f96316d95bf0c04848031437a285934912c68b83.tar.gz | |
9.0.0rc3
Diffstat (limited to 'bin/named/unix/os.c')
| -rw-r--r-- | bin/named/unix/os.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c index cfe6e01a..7fee42c9 100644 --- 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 |