X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=daemon%2Fmain.c;h=20aee80ff253fb02007a7631b07bf4e3936b6926;hb=7a5d050f8f68a4ac9bfa7e75bacabd81350ed650;hp=8a287a04c92620463d2cb472c9a39c3f6e2c769c;hpb=9a0b3ef87823b01821ecaf541a486b1cd107ba8f;p=doldaconnect.git

diff --git a/daemon/main.c b/daemon/main.c
index 8a287a0..20aee80 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -371,13 +371,13 @@ int main(int argc, char **argv)
     char *configfile;
     char *pidfile;
     FILE *pfstream, *confstream;
-    int delay;
+    int delay, immsyslog;
     struct module *mod;
     struct timer *timer, *ntimer;
     struct child *child;
     double now;
     
-    nofork = 0;
+    immsyslog = nofork = 0;
     syslogfac = LOG_DAEMON;
     configfile = NULL;
     pidfile = NULL;
@@ -425,18 +425,23 @@ int main(int argc, char **argv)
 	    nofork = 1;
 	    break;
 	case 's':
-	    logtosyslog = 1;
-	    logtostderr = 0;
+	    immsyslog = 1;
+	    break;
 	case 'h':
 	case ':':
 	case '?':
 	default:
-	    printf("usage: doldacond [-hn] [-C configfile] [-p pidfile] [-f facility]\n");
+	    printf("usage: doldacond [-hns] [-C configfile] [-p pidfile] [-f facility]\n");
 	    exit(c != 'h');
 	}
     }
     setlocale(LC_ALL, "");
     initlog();
+    if(immsyslog)
+    {
+	logtosyslog = 1;
+	logtostderr = 0;
+    }
     signal(SIGPIPE, SIG_IGN);
     signal(SIGHUP, handler);
     signal(SIGINT, handler);
@@ -557,5 +562,7 @@ int main(int argc, char **argv)
     }
     flog(LOG_INFO, "terminating...");
     terminate();
+    if(pidfile != NULL)
+	unlink(pidfile);
     return(0);
 }