extern char version[];
+#include "secnet.h"
#include <stdio.h>
#include <string.h>
#include <getopt.h>
-#include <stdarg.h>
#include <errno.h>
-#include <sys/types.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 "secnet.h"
#include "util.h"
#include "conffile.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;
static char *pidfile=NULL;
+bool_t require_root_privileges=False;
+string_t require_root_privileges_explanation=NULL;
/* Structures dealing with poll() call */
struct poll_interest {
{"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;
" -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"
fatal("secnet: no config filename specified");
break;
+ case 'j':
+ just_check_config=True;
+ break;
+
case '?':
break;
/* Pidfile name */
pidfile=dict_read_string(system,"pidfile",False,"system",loc);
+ /* Check whether we need root privileges */
+ if (require_root_privileges && uid!=0) {
+ fatal("the following configured feature (\"%s\") requires "
+ "that secnet retain root privileges while running.\n",
+ require_root_privileges_explanation);
+ }
+
/* Go along site list, starting sites */
l=dict_lookup(config,"sites");
if (!l) {
- fatal("configuration did not define any remote sites\n");
- }
- i=0;
- while ((site=list_elem(l, i++))) {
- struct site_if *s;
- if (site->type!=t_closure) {
- cfgfatal(site->loc,"system","non-closure in site list");
- }
- if (site->data.closure->type!=CL_SITE) {
- cfgfatal(site->loc,"system","non-site closure in site list");
+ Message(M_WARNING,"secnet: configuration did not define any "
+ "remote sites\n");
+ } else {
+ i=0;
+ while ((site=list_elem(l, i++))) {
+ struct site_if *s;
+ if (site->type!=t_closure) {
+ cfgfatal(site->loc,"system","non-closure in site list");
+ }
+ if (site->data.closure->type!=CL_SITE) {
+ cfgfatal(site->loc,"system","non-site closure in site list");
+ }
+ s=site->data.closure->interface;
+ s->control(s->st,True);
}
- s=site->data.closure->interface;
- s->control(s->st,True);
}
}
/* Background now, if we're supposed to: we may be unable to write the
pidfile if we don't. */
if (background) {
- printf("goto background\n");
/* Open the pidfile before forking - that way the parent can tell
whether it succeeds */
if (pidfile) {
} else if (p==0) {
/* Child process - all done, just carry on */
if (pf) fclose(pf);
- printf("child\n");
} else {
/* Error */
fatal_perror("cannot fork");
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();