X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=secnet.c;h=8987af35f65ee91059accec6963d7ddbc32c89f4;hb=ff05a229397c75142725f45cad191ce4a00625ce;hp=489e0bf381e3686acb28433d4077dab953c78e66;hpb=042a8da9053c205ea74ec1785c93ca4bcf4ea5e0;p=secnet.git

diff --git a/secnet.c b/secnet.c
index 489e0bf..8987af3 100644
--- a/secnet.c
+++ b/secnet.c
@@ -1,9 +1,3 @@
-/* $Log: secnet.c,v $
- * Revision 1.1  1996/03/13 22:27:41  sde1000
- * Initial revision
- *
- */
-
 extern char version[];
 
 #include "secnet.h"
@@ -22,6 +16,7 @@ extern char version[];
 
 /* XXX should be from autoconf */
 static char *configfile="/etc/secnet/secnet.conf";
+static char *sites_key="sites";
 bool_t just_check_config=False;
 static char *userid=NULL;
 static uid_t uid=0;
@@ -73,10 +68,11 @@ static void parse_options(int argc, char **argv)
 	    {"debug", 1, 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:",
+	c=getopt_long(argc, argv, "vwdnjc:ft:s:",
 		      long_options, &option_index);
 	if (c==-1)
 	    break;
@@ -90,11 +86,15 @@ static void parse_options(int argc, char **argv)
 		    "  -w, --nowarnings        suppress warnings\n"
 		    "  -v, --verbose           output extra diagnostics\n"
 		    "  -c, --config=filename   specify a configuration file\n"
-		    "  -j, --just-check-config stop after reading configfile\n"
+		    "  -j, --just-check-config stop after reading "
+		    "configuration file\n"
+		    "  -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"
 		    "      --help              display this help and exit\n"
-		    "      --version           output version information and exit\n"
+		    "      --version           output version information "
+		    "and exit\n"
 		);
 	    exit(0);
 	    break;
@@ -106,7 +106,7 @@ static void parse_options(int argc, char **argv)
 	    break;
 
 	case 'v':
-	    message_level|=M_INFO|M_NOTICE|M_WARNING|M_ERROR|M_SECURITY|
+	    message_level|=M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY|
 		M_FATAL;
 	    break;
 
@@ -137,16 +137,23 @@ static void parse_options(int argc, char **argv)
 	    just_check_config=True;
 	    break;
 
+	case 's':
+	    if (optarg)
+		sites_key=safe_strdup(optarg,"sites-key");
+	    else
+		fatal("secnet: no sites key specified");
+	    break;
+
 	case '?':
 	    break;
 
 	default:
-	    Message(M_ERROR,"secnet: Unknown getopt code %c\n",c);
+	    Message(M_ERR,"secnet: Unknown getopt code %c\n",c);
 	}
     }
 
     if (argc-optind != 0) {
-	Message(M_ERROR,"secnet: You gave extra command line parameters, "
+	Message(M_ERR,"secnet: You gave extra command line parameters, "
 		"which were ignored.\n");
     }
 }
@@ -202,10 +209,10 @@ static void setup(dict_t *config)
     }
 
     /* Go along site list, starting sites */
-    l=dict_lookup(config,"sites");
+    l=dict_lookup(config,sites_key);
     if (!l) {
-	Message(M_WARNING,"secnet: configuration did not define any "
-		"remote sites\n");
+	Message(M_WARNING,"secnet: configuration key \"%s\" is missing; no "
+		"remote sites are defined\n",sites_key);
     } else {
 	i=0;
 	while ((site=list_elem(l, i++))) {
@@ -268,7 +275,8 @@ static void run(void)
 	if (gettimeofday(&tv_now, NULL)!=0) {
 	    fatal_perror("main loop: gettimeofday");
 	}
-	now=(tv_now.tv_sec*1000)+(tv_now.tv_usec/1000);
+	now=((uint64_t)tv_now.tv_sec*(uint64_t)1000)+
+	    ((uint64_t)tv_now.tv_usec/(uint64_t)1000);
 	idx=0;
 	for (i=reg; i; i=i->next) {
 	    i->after(i->state, fds+idx, i->nfds, &tv_now, &now);
@@ -342,7 +350,15 @@ static void droppriv(void)
 	} else if (p==0) {
 	    /* Child process - all done, just carry on */
 	    if (pf) fclose(pf);
+	    /* Close stdin, stdout and stderr; we don't need them any more */
+	    /* XXX we must leave stderr pointing to something useful -
+               a pipe to a log destination, for example, or just leave
+               it alone. */
+	    close(0);
+	    close(1);
+	    /* XXX close(2); */
 	    secnet_is_daemon=True;
+	    setsid();
 	} else {
 	    /* Error */
 	    fatal_perror("cannot fork");