Import release 0.1.15

[secnet.git] / secnet.c

diff --git a/secnet.c b/secnet.c
index 39a635a033cd5714253654dacac7fcc6bc00a3cf..bef236dda9a2b466fad8636e7d51749b7eaaa5e6 100644 (file)
--- 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"
 extern char version[];
 
 #include "secnet.h"


@@ -21,15 +15,15 @@ extern char version[];
 #include "process.h"
 
 /* XXX should be from autoconf */
 #include "process.h"
 
 /* XXX should be from autoconf */

-static char *configfile="/etc/secnet/secnet.conf";
-static char *sites_key="sites";
+static const char *configfile="/etc/secnet/secnet.conf";
+static const char *sites_key="sites";

 bool_t just_check_config=False;
 static char *userid=NULL;
 static uid_t uid=0;
 bool_t background=True;
 static char *pidfile=NULL;
 bool_t require_root_privileges=False;
 bool_t just_check_config=False;
 static char *userid=NULL;
 static uid_t uid=0;
 bool_t background=True;
 static char *pidfile=NULL;
 bool_t require_root_privileges=False;

-string_t require_root_privileges_explanation=NULL;
+cstring_t require_root_privileges_explanation=NULL;

 
 static pid_t secnet_pid;
 
 
 static pid_t secnet_pid;
 


@@ -48,7 +42,7 @@ struct poll_interest {
     void *state;
     uint32_t max_nfds;
     uint32_t nfds;
     void *state;
     uint32_t max_nfds;
     uint32_t nfds;

-    string_t desc;
+    cstring_t desc;

     struct poll_interest *next;
 };
 static struct poll_interest *reg=NULL;
     struct poll_interest *next;
 };
 static struct poll_interest *reg=NULL;


@@ -86,28 +80,27 @@ static void parse_options(int argc, char **argv)
        switch(c) {
        case 2:
            /* Help */
        switch(c) {
        case 2:
            /* Help */

-           fprintf(stderr,
-                   "Usage: secnet [OPTION]...\n\n"
-                   "  -f, --silent, --quiet   suppress error messages\n"
-                   "  -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 "
-                   "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"
+           printf("Usage: secnet [OPTION]...\n\n"
+                  "  -f, --silent, --quiet   suppress error messages\n"
+                  "  -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 "
+                  "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"

                );
            exit(0);
            break;
       
        case 1:
            /* Version */
                );
            exit(0);
            break;
       
        case 1:
            /* Version */

-           fprintf(stderr,"%s\n",version);
+           printf("%s\n",version);

            exit(0);
            break;
 
            exit(0);
            break;
 


@@ -176,7 +169,7 @@ static void setup(dict_t *config)
     l=dict_lookup(config,"system");
 
     if (!l || list_elem(l,0)->type!=t_dict) {
     l=dict_lookup(config,"system");
 
     if (!l || list_elem(l,0)->type!=t_dict) {

-       fatal("configuration does not include a \"system\" dictionary\n");
+       fatal("configuration does not include a \"system\" dictionary");

     }
     system=list_elem(l,0)->data.dict;
     loc=list_elem(l,0)->loc;
     }
     system=list_elem(l,0)->data.dict;
     loc=list_elem(l,0)->loc;


@@ -184,7 +177,7 @@ static void setup(dict_t *config)
     /* Arrange systemwide log facility */
     l=dict_lookup(system,"log");
     if (!l) {
     /* Arrange systemwide log facility */
     l=dict_lookup(system,"log");
     if (!l) {

-       fatal("configuration does not include a system/log facility\n");
+       fatal("configuration does not include a system/log facility");

     }
     system_log=init_log(l);
 
     }
     system_log=init_log(l);
 


@@ -200,7 +193,7 @@ static void setup(dict_t *config)
        } while(pw);
        endpwent();
        if (uid==0) {
        } while(pw);
        endpwent();
        if (uid==0) {

-           fatal("userid \"%s\" not found\n",userid);
+           fatal("userid \"%s\" not found",userid);

        }
     }
 
        }
     }
 


@@ -209,8 +202,8 @@ static void setup(dict_t *config)
 
     /* Check whether we need root privileges */
     if (require_root_privileges && uid!=0) {
 
     /* 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",
+       fatal("the configured feature \"%s\" requires "
+             "that secnet retain root privileges while running.",

              require_root_privileges_explanation);
     }
 
              require_root_privileges_explanation);
     }
 


@@ -236,7 +229,7 @@ static void setup(dict_t *config)
 }
 
 void register_for_poll(void *st, beforepoll_fn *before,
 }
 
 void register_for_poll(void *st, beforepoll_fn *before,

-                      afterpoll_fn *after, uint32_t max_nfds, string_t desc)
+                      afterpoll_fn *after, uint32_t max_nfds, cstring_t desc)

 {
     struct poll_interest *i;
 
 {
     struct poll_interest *i;
 


@@ -272,7 +265,7 @@ static void run(void)
 
     fds=alloca(sizeof(*fds)*total_nfds);
     if (!fds) {
 
     fds=alloca(sizeof(*fds)*total_nfds);
     if (!fds) {

-       fatal("run: couldn't alloca\n");
+       fatal("run: couldn't alloca");

     }
 
     Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid);
     }
 
     Message(M_NOTICE,"%s [%d]: starting\n",version,secnet_pid);


@@ -297,10 +290,10 @@ static void run(void)
            if (rv!=0) {
                /* XXX we need to handle this properly: increase the
                   nfds available */
            if (rv!=0) {
                /* XXX we need to handle this properly: increase the
                   nfds available */

-               fatal("run: beforepoll_fn (%s) returns %d\n",i->desc,rv);
+               fatal("run: beforepoll_fn (%s) returns %d",i->desc,rv);

            }
            if (timeout<-1) {
            }
            if (timeout<-1) {

-               fatal("run: beforepoll_fn (%s) set timeout to %d\n",timeout);
+               fatal("run: beforepoll_fn (%s) set timeout to %d",timeout);

            }
            idx+=nfds;
            remain-=nfds;
            }
            idx+=nfds;
            remain-=nfds;


@@ -322,6 +315,7 @@ static void droppriv(void)
 {
     FILE *pf=NULL;
     pid_t p;
 {
     FILE *pf=NULL;
     pid_t p;

+    int errfds[2];

 
     add_hook(PHASE_SHUTDOWN,system_phase_hook,NULL);
 
 
     add_hook(PHASE_SHUTDOWN,system_phase_hook,NULL);
 


@@ -356,11 +350,20 @@ static void droppriv(void)
        } else if (p==0) {
            /* Child process - all done, just carry on */
            if (pf) fclose(pf);
        } 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 */
+           /* 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);
            close(0);
            close(1);
            close(2);

+           dup2(errfds[1],0);
+           dup2(errfds[1],1);
+           dup2(errfds[1],2);

            secnet_is_daemon=True;
            secnet_is_daemon=True;

+           setsid();
+           log_from_fd(errfds[0],"stderr",system_log);

        } else {
            /* Error */
            fatal_perror("cannot fork");
        } else {
            /* Error */
            fatal_perror("cannot fork");


@@ -407,8 +410,9 @@ int main(int argc, char **argv)
     droppriv();
 
     start_signal_handling();
     droppriv();
 
     start_signal_handling();

-    request_signal_notification(SIGTERM,finish,"SIGTERM");
-    if (!background) request_signal_notification(SIGINT,finish,"SIGINT");
+    request_signal_notification(SIGTERM,finish,safe_strdup("SIGTERM","run"));
+    if (!background) request_signal_notification(SIGINT,finish,
+                                                safe_strdup("SIGINT","run"));

     request_signal_notification(SIGHUP,ignore_hup,NULL);
     enter_phase(PHASE_RUN);
     run();
     request_signal_notification(SIGHUP,ignore_hup,NULL);
     enter_phase(PHASE_RUN);
     run();