/* -*-c-*-
*
- * $Id: become.c,v 1.22 2003/10/12 00:14:55 mdw Exp $
+ * $Id: become.c,v 1.24 2003/10/15 09:27:06 mdw Exp $
*
* Main code for `become'
*
/*----- Revision history --------------------------------------------------*
*
* $Log: become.c,v $
+ * Revision 1.24 2003/10/15 09:27:06 mdw
+ * Make sure standard file descriptors are open before starting properly.
+ *
+ * Revision 1.23 2003/10/12 10:00:06 mdw
+ * Fix for daemon mode. Oops.
+ *
* Revision 1.22 2003/10/12 00:14:55 mdw
* Major overhaul. Now uses DSA signatures rather than the bogus symmetric
* encrypt-and-hope thing. Integrated with mLib and Catacomb.
#include <pwd.h>
#include <syslog.h>
#include <unistd.h>
+#include <fcntl.h>
extern char **environ;
#ifndef NONETWORK
"\n"
"-d, --daemon Start a daemon\n"
+"-n, --nofork In daemon mode, don't fork into background\n"
"-p PORT, --port=PORT In daemon mode, listen on PORT\n"
"-f FILE, --config-file=FILE In daemon mode, read config from FILE\n"
#endif
/* --- Definitions for the various flags --- */
- enum {
- f_daemon = 1, /* Start up in daemon mode */
- f_duff = 2, /* Fault in arguments */
- f_shell = 4, /* Run a default shell */
- f_dummy = 8, /* Don't actually do anything */
- f_setuid = 16, /* We're running setuid */
- f_havegroup = 32 /* Set a default group */
- };
+#define f_daemon 1u /* Start up in daemon mode */
+#define f_duff 2u /* Fault in arguments */
+#define f_shell 4u /* Run a default shell */
+#define f_dummy 8u /* Don't actually do anything */
+#define f_setuid 16u /* We're running setuid */
+#define f_havegroup 32u /* Set a default group */
+#define f_nofork 64u /* Don't fork into background */
/* --- Set up the program name --- */
if (getuid() != geteuid())
flags |= f_setuid;
+ /* --- Make sure standard file descriptors are open --- */
+
+ {
+ int fd;
+ do {
+ if ((fd = open("/dev/null", O_RDWR)) < 0)
+ die(1, "couldn't open /dev/null: %s", strerror(errno));
+ } while (fd <= STDERR_FILENO);
+ close(fd);
+ }
+
/* --- Read the environment into a hashtable --- */
{
/* --- Group style options --- */
- { "group", gFlag_argReq, 0, 'g' },
+ { "group", OPTF_ARGREQ, 0, 'g' },
#ifdef HAVE_SETGROUPS
{ "keep-groups", 0, 0, 'k' },
{ "merge-groups", 0, 0, 'm' },
/* --- Command to run options --- */
- { "command", gFlag_argReq, 0, 'c' },
+ { "command", OPTF_ARGREQ, 0, 'c' },
/* --- Server options --- */
#ifndef NONETWORK
{ "daemon", 0, 0, 'd' },
- { "port", gFlag_argReq, 0, 'p' },
- { "config-file", gFlag_argReq, 0, 'f' },
+ { "nofork", 0, 0, 'n' },
+ { "port", OPTF_ARGREQ, 0, 'p' },
+ { "config-file", OPTF_ARGREQ, 0, 'f' },
#endif
/* --- Tracing options --- */
#ifndef NTRACE
- { "impersonate", gFlag_argReq, 0, 'I' },
- { "trace", gFlag_argOpt, 0, 'T' },
- { "trace-level", gFlag_argOpt, 0, 'L' },
+ { "impersonate", OPTF_ARGREQ, 0, 'I' },
+ { "trace", OPTF_ARGOPT, 0, 'T' },
+ { "trace-level", OPTF_ARGOPT, 0, 'L' },
#endif
{ 0, 0, 0, 0 }
#endif
"c:" /* Command to run options */
#ifndef NONETWORK
- "dp:f:" /* Server options */
+ "dnp:f:" /* Server options */
#endif
#ifndef NTRACE
"I:T::L::" /* Tracing options */
case 'd':
flags |= f_daemon;
break;
+ case 'n':
+ flags |= f_nofork;
+ break;
case 'f':
conffile = optarg;
break;
#ifndef NONETWORK
if (flags & f_daemon) {
T( trace(TRACE_MISC, "become: daemon mode requested"); )
- daemon_init(conffile, port);
+ daemon_init(conffile, port, (flags & f_nofork) ? df_nofork : 0);
exit(0);
}
#endif