Drop privileges more.

git-svn-id: file:///svn/unbound/trunk@1209 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/config.h.in b/config.h.in
index 268ce1917820eb5a7f5aa53b4ba731ec1824d658..f3b24a448f474da4b1779f138b229a04425ac5ab 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -136,6 +136,18 @@
 /* Define to 1 if you have the `sendmsg' function. */
 #undef HAVE_SENDMSG
 
+/* Define to 1 if you have the `setregid' function. */
+#undef HAVE_SETREGID
+
+/* Define to 1 if you have the `setresgid' function. */
+#undef HAVE_SETRESGID
+
+/* Define to 1 if you have the `setresuid' function. */
+#undef HAVE_SETRESUID
+
+/* Define to 1 if you have the `setreuid' function. */
+#undef HAVE_SETREUID
+
 /* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 

diff --git a/configure b/configure
index e1f1971bbcd4d80938f3f84636972efc92574d16..c6cdeaf2e991ac1f72f508dd5ea3ef8f1bd1dfd6 100755 (executable)
--- a/configure
+++ b/configure
@@ -24000,13 +24000,11 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
   ;
   return 0;
 }
@@ -24046,13 +24044,11 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
-     #include <stdio.h>
+#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
-     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
   ;
   return 0;
 }
@@ -24666,7 +24662,11 @@ fi
 
 
 
-for ac_func in tzset sigprocmask fcntl getpwnam getrlimit setsid sbrk chroot kill sleep usleep random srandom recvmsg sendmsg writev
+
+
+
+
+for ac_func in tzset sigprocmask fcntl getpwnam getrlimit setsid sbrk chroot kill sleep usleep random srandom recvmsg sendmsg writev setresuid setreuid setresgid setregid
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/configure.ac b/configure.ac
index 6fd28978e9eeae6c0834e91d1d6ec82145ece3bb..676c96cf68c2a0bee7365dd54a018dd38025269f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -781,7 +781,7 @@ AC_CHECK_GETADDRINFO_WITH_INCLUDES
 if test $ac_cv_func_getaddrinfo = no; then
 AC_LIBOBJ([fake-rfc2553])
 fi
-AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam getrlimit setsid sbrk chroot kill sleep usleep random srandom recvmsg sendmsg writev])
+AC_CHECK_FUNCS([tzset sigprocmask fcntl getpwnam getrlimit setsid sbrk chroot kill sleep usleep random srandom recvmsg sendmsg writev setresuid setreuid setresgid setregid])
 
 # check mkdir
 AC_MSG_CHECKING([whether mkdir has one arg])

diff --git a/daemon/unbound.c b/daemon/unbound.c
index 8720a7261b8e875c7ce9c46ab5ba651c3082ac31..d8eef1d8a96154a98ab4c0d9bc70df57b9fc0cee 100644 (file)
--- a/daemon/unbound.c
+++ b/daemon/unbound.c
@@ -374,10 +374,22 @@ do_chroot(struct daemon* daemon, struct config_file* cfg, int debug_mode,
        }
 #ifdef HAVE_GETPWNAM
        if(cfg->username && cfg->username[0]) {
+#ifdef HAVE_SETRESGID
+               if(setresgid(gid,gid,gid) != 0)
+#elif defined(HAVE_SETREGID)
+               if(setregid(gid,gid) != 0)
+#else /* use setgid */
                if(setgid(gid) != 0)
+#endif /* HAVE_SETRESGID */
                        fatal_exit("unable to set group id of %s: %s", 
                                cfg->username, strerror(errno));
+#ifdef HAVE_SETRESUID
+               if(setresuid(uid,uid,uid) != 0)
+#elif defined(HAVE_SETREUID)
+               if(setreuid(uid,uid) != 0)
+#else /* use setuid */
                if(setuid(uid) != 0)
+#endif /* HAVE_SETRESUID */
                        fatal_exit("unable to set user id of %s: %s", 
                                cfg->username, strerror(errno));
                verbose(VERB_QUERY, "drop user privileges, run as %s", 

diff --git a/doc/Changelog b/doc/Changelog
index 4f866d6123ce96ad66311a94581e0197bd81c742..e6aeb864e24414f1e8e2f00a8ef457913b38294c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,7 @@
        - test for DLV used for a zone below a trustanchor.
        - added scrub filter for overreaching NSEC records and unit test.
        - iana portlist update
+       - use of setresuid or setreuid when available.
 
 25 August 2008: Wouter
        - realclean patch from Robert Edmonds.