diff options
Diffstat (limited to 'nscd')
| -rw-r--r-- | nscd/nscd.c | 43 | ||||
| -rw-r--r-- | nscd/nscd.conf | 4 | ||||
| -rw-r--r-- | nscd/nscd.h | 5 | ||||
| -rw-r--r-- | nscd/nscd_conf.c | 11 |
4 files changed, 58 insertions, 5 deletions
diff --git a/nscd/nscd.c b/nscd/nscd.c index 45928f0f67..bc291d81d9 100644 --- a/nscd/nscd.c +++ b/nscd/nscd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (c) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. @@ -62,6 +62,7 @@ int do_shutdown; int disabled_passwd; int disabled_group; int go_background = 1; +const char *server_user; int secure[lastdb]; int secure_in_use; @@ -69,6 +70,7 @@ static const char *conffile = _PATH_NSCDCONF; static int check_pid (const char *file); static int write_pid (const char *file); +static void drop_privileges (void); /* Name and version of program. */ static void print_version (FILE *stream, struct argp_state *state); @@ -140,6 +142,8 @@ main (int argc, char **argv) if (fork ()) exit (0); + setsid (); + chdir ("/"); openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON); @@ -164,6 +168,10 @@ main (int argc, char **argv) /* Init databases. */ nscd_init (conffile); + /* Change to unprivileged UID if specifed in config file */ + if(server_user && !secure_in_use) + drop_privileges (); + /* Handle incoming requests */ start_threads (); @@ -364,3 +372,36 @@ write_pid (const char *file) return 0; } + +/* Look up the uid and gid associated with the user we are supposed to run + the server as, and then call setgid(), setgroups(), and setuid(). + Otherwise, abort- we should not run as root if the configuration file + specifically tells us not to. */ + +static void +drop_privileges (void) +{ + int buflen = 256; + char *buffer = alloca (buflen); + struct passwd resultbuf; + struct passwd *pwd; + + while (__getpwnam_r (server_user, &resultbuf, buffer, buflen, &pwd) != 0 + && errno == ERANGE) + { + errno = 0; + buflen += 256; + buffer = alloca (buflen); + } + + if(!pwd) + { + dbg_log (_("Failed to look up user '%s' to run server as"), + server_user); + exit(1); + } + + setgroups (0, NULL); + setgid (pwd->pw_gid); + setuid (pwd->pw_uid); +} diff --git a/nscd/nscd.conf b/nscd/nscd.conf index 0e43da33f5..226dda377f 100644 --- a/nscd/nscd.conf +++ b/nscd/nscd.conf @@ -8,6 +8,8 @@ # logfile <file> # debug-level <level> # threads <#threads to use> +# server-user <user to run server as instead of root> +# server-user is ignored if nscd is started with -S parameters # # enable-cache <service> <yes|no> # positive-time-to-live <service> <time in seconds> @@ -21,7 +23,7 @@ # logfile /var/log/nscd.log # threads 6 - +# server-user nobody debug-level 0 enable-cache passwd yes diff --git a/nscd/nscd.h b/nscd/nscd.h index 36fd1b3002..ab93a9ac3e 100644 --- a/nscd/nscd.h +++ b/nscd/nscd.h @@ -1,4 +1,4 @@ -/* Copyright (c) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (c) 1998, 1999, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. @@ -96,6 +96,9 @@ extern int nthreads; extern int secure[lastdb]; extern int secure_in_use; /* Is one of the above 1 ? */ +/* User name to run server processes as */ +extern const char *server_user; + /* Prototypes for global functions. */ /* nscd.c */ diff --git a/nscd/nscd_conf.c b/nscd/nscd_conf.c index 010b905fe8..9b8d75ce23 100644 --- a/nscd/nscd_conf.c +++ b/nscd/nscd_conf.c @@ -1,6 +1,6 @@ -/* Copyright (c) 1998 Free Software Foundation, Inc. +/* Copyright (c) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1998. + Contributed by Thorsten Kukuk <kukuk@suse.de>, 1998. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -176,6 +176,13 @@ nscd_parse_file (const char *fname, struct database dbs[lastdb]) if (nthreads == -1) nthreads = MAX (atol (arg1), lastdb); } + else if (strcmp (entry, "server-user") == 0) + { + if (!arg1) + dbg_log (_("Must specify user name for server-user option"), arg1); + else + server_user = strdup (arg1); + } else dbg_log (_("Unknown option: %s %s %s"), entry, arg1, arg2); } |