X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=blobdiff_plain;f=secnet.c;h=be94f95e6398c84c8a288bbe9315037abcaaeefe;hp=0df6e0919c9befd5353acda7a12b133d61d86ee2;hb=baa06aeb963965b4b6a8a8051ec15b72372080dd;hpb=2fe58dfd10216a37f1ece081f926971882de112e

diff --git a/secnet.c b/secnet.c
index 0df6e09..be94f95 100644
--- a/secnet.c
+++ b/secnet.c
@@ -4,29 +4,24 @@
  *
  */
 
-static char *version="secnet version " VERSION " $Date: 1996/03/13 22:27:41 $";
+extern char version[];
 
+#include "secnet.h"
 #include <stdio.h>
 #include <string.h>
 #include <getopt.h>
-#include <stdarg.h>
 #include <errno.h>
+#include <unistd.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
-#include <sys/time.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
-#include <adns.h>
 #include <pwd.h>
-#include <sys/types.h>
 
-#include "secnet.h"
 #include "util.h"
 #include "conffile.h"
-#include "modules.h"
 
 /* Command-line options (possibly config-file options too) */
 static char *configfile="/etc/secnet/secnet.conf";
+bool_t just_check_config=False;
 static char *userid=NULL;
 static uid_t uid=0;
 static bool_t background=True;
@@ -64,10 +59,11 @@ static void parse_options(int argc, char **argv)
 	    {"quiet", 0, 0, 'f'},
 	    {"debug", 1, 0, 'd'},
 	    {"config", 1, 0, 'c'},
+	    {"just-check-config", 0, 0, 'j'},
 	    {0,0,0,0}
 	};
 
-	c=getopt_long(argc, argv, "vwdnc:ft:",
+	c=getopt_long(argc, argv, "vwdnjc:ft:",
 		      long_options, &option_index);
 	if (c==-1)
 	    break;
@@ -81,6 +77,7 @@ 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"
 		    "  -n, --nodetach          do not run in background\n"
 		    "  -d, --debug=item,...    set debug options\n"
 		    "      --help              display this help and exit\n"
@@ -118,6 +115,10 @@ static void parse_options(int argc, char **argv)
 		fatal("secnet: no config filename specified");
 	    break;
 
+	case 'j':
+	    just_check_config=True;
+	    break;
+
 	case '?':
 	    break;
 
@@ -156,7 +157,7 @@ static void setup(dict_t *config)
 	fatal("configuration does not include a system/log facility\n");
     }
     log=init_log(l);
-    log->log(log->st,LOG_DEBUG,"setup: logging started");
+    log->log(log->st,LOG_DEBUG,"%s: logging started",version);
 
     /* Who are we supposed to run as? */
     userid=dict_read_string(system,"userid",False,"system",loc);
@@ -345,6 +346,14 @@ int main(int argc, char **argv)
 
     enter_phase(PHASE_SETUP);
     setup(config);
+
+    if (just_check_config) {
+	Message(M_INFO,"configuration file check complete\n");
+	exit(0);
+    }
+
+    enter_phase(PHASE_GETRESOURCES);
+    /* Appropriate phase hooks will have been run */
     
     enter_phase(PHASE_DROPPRIV);
     droppriv();