#include <sys/socket.h>
#include <arpa/inet.h>
#include <pwd.h>
+#include <grp.h>
#include "util.h"
#include "conffile.h"
bool_t just_check_config=False;
static char *userid=NULL;
static uid_t uid=0;
+static gid_t gid;
bool_t background=True;
static char *pidfile=NULL;
bool_t require_root_privileges=False;
{"help", 0, 0, 2},
{"version", 0, 0, 1},
{"nodetach", 0, 0, 'n'},
+ {"managed", 0, 0, 'm'},
{"silent", 0, 0, 'f'},
{"quiet", 0, 0, 'f'},
- {"debug", 1, 0, 'd'},
+ {"debug", 0, 0, 'd'},
{"config", 1, 0, 'c'},
{"just-check-config", 0, 0, 'j'},
{"sites-key", 1, 0, 's'},
{0,0,0,0}
};
- c=getopt_long(argc, argv, "vwdnjc:ft:s:",
+ c=getopt_long(argc, argv, "vwdnjc:ft:s:m",
long_options, &option_index);
if (c==-1)
break;
" -s, --sites-key=name configuration key that "
"specifies active sites\n"
" -n, --nodetach do not run in background\n"
- " -d, --debug=item,... set debug options\n"
+ " -m, --managed running under a supervisor\n"
+ " -d, --debug output debug messages\n"
" --help display this help and exit\n"
" --version output version information "
"and exit\n"
background=False;
break;
+ case 'm':
+ secnet_is_daemon=True;
+ break;
+
case 'c':
if (optarg)
configfile=safe_strdup(optarg,"config_filename");
break;
case '?':
+ exit(1);
break;
default:
/* Who are we supposed to run as? */
userid=dict_read_string(system,"userid",False,"system",loc);
if (userid) {
- do {
- pw=getpwent();
- if (pw && strcmp(pw->pw_name,userid)==0) {
- uid=pw->pw_uid;
- break;
- }
- } while(pw);
- endpwent();
- if (uid==0) {
+ if (!(pw=getpwnam(userid)))
fatal("userid \"%s\" not found",userid);
- }
+ uid=pw->pw_uid;
+ gid=pw->pw_gid;
}
/* Pidfile name */
((uint64_t)tv_now_global.tv_usec/(uint64_t)1000);
idx=0;
for (i=reg; i; i=i->next) {
- if(fds[idx].revents & POLLNVAL) {
- fatal("run: poll (%s) set POLLNVAL", i->desc);
+ int check;
+ for (check=0; check<i->nfds; check++) {
+ if(fds[idx+check].revents & POLLNVAL) {
+ fatal("run: poll (%s#%d) set POLLNVAL", i->desc, check);
+ }
}
i->after(i->state, fds+idx, i->nfds);
idx+=i->nfds;
fatal("run: beforepoll_fn (%s) returns %d",i->desc,rv);
}
if (timeout<-1) {
- fatal("run: beforepoll_fn (%s) set timeout to %d",timeout);
+ fatal("run: beforepoll_fn (%s) set timeout to %d",
+ i->desc,timeout);
}
idx+=nfds;
remain-=nfds;
free(fds);
}
+/* Surrender privileges, if necessary */
static void droppriv(void)
+{
+ if (userid) {
+ if (setgid(gid)!=0)
+ fatal_perror("can't set gid to %ld",(long)gid);
+ if (initgroups(userid, gid) < 0)
+ fatal_perror("initgroups");
+ if (setuid(uid)!=0) {
+ fatal_perror("can't set uid to \"%s\"",userid);
+ }
+ assert(getuid() == uid);
+ assert(geteuid() == uid);
+ assert(getgid() == gid);
+ assert(getegid() == gid);
+ }
+}
+
+/* Become a daemon, if necessary */
+static void become_daemon(void)
{
FILE *pf=NULL;
pid_t p;
add_hook(PHASE_SHUTDOWN,system_phase_hook,NULL);
- /* Open the pidfile for writing now: we may be unable to do so
- once we drop privileges. */
- if (pidfile) {
- pf=fopen(pidfile,"w");
- if (!pf) {
- fatal_perror("cannot open pidfile \"%s\"",pidfile);
- }
- }
- if (!background && pf) {
- fprintf(pf,"%d\n",getpid());
- fclose(pf);
- }
-
- /* Now drop privileges */
- if (uid!=0) {
- if (setuid(uid)!=0) {
- fatal_perror("can't set uid to \"%s\"",userid);
- }
- }
- if (background) {
+ /* We only want to become a daemon if we are not one
+ already */
+ if (background && !secnet_is_daemon) {
p=fork();
if (p>0) {
- if (pf) {
- /* Parent process - write pidfile, exit */
- fprintf(pf,"%d\n",p);
- fclose(pf);
- }
- exit(0);
+ /* Parent process - just exit */
+ _exit(0);
} else if (p==0) {
/* Child process - all done, just carry on */
- if (pf) fclose(pf);
- /* Close stdin and stdout; we don't need them any more.
- stderr is redirected to the system/log facility */
- if (pipe(errfds)!=0) {
- fatal_perror("can't create pipe for stderr");
- }
- close(0);
- close(1);
- close(2);
- dup2(errfds[1],0);
- dup2(errfds[1],1);
- dup2(errfds[1],2);
secnet_is_daemon=True;
- setsid();
- log_from_fd(errfds[0],"stderr",system_log);
+ if (setsid() < 0)
+ fatal_perror("setsid");
} else {
/* Error */
fatal_perror("cannot fork");
exit(1);
}
}
+ if (secnet_is_daemon) {
+ /* stderr etc are redirected to the system/log facility */
+ pipe_cloexec(errfds);
+ if (dup2(errfds[1],0) < 0
+ || dup2(errfds[1],1) < 0
+ || dup2(errfds[1],2) < 0)
+ fatal_perror("can't dup2 pipe");
+ if (close(errfds[1]) < 0)
+ fatal_perror("can't close redundant pipe endpoint");
+ log_from_fd(errfds[0],"stderr",system_log);
+ }
secnet_pid=getpid();
+
+ /* Now we can write the pidfile */
+ if (pidfile) {
+ pf=fopen(pidfile,"w");
+ if (!pf) {
+ fatal_perror("cannot open pidfile \"%s\"",pidfile);
+ }
+ if (fprintf(pf,"%ld\n",(long)secnet_pid) < 0
+ || fclose(pf) < 0)
+ fatal_perror("cannot write to pidfile \"%s\"",pidfile);
+ }
}
static signal_notify_fn finish,ignore_hup;
exit(0);
}
+ enter_phase(PHASE_DAEMONIZE);
+ become_daemon();
+
enter_phase(PHASE_GETRESOURCES);
/* Appropriate phase hooks will have been run */
~ian / secnet.git / blobdiff