X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=34b4fbbcfab42c00cc6b5f290d02409cfa3775f9;hb=e4947fba7dd007870a0cdc55ec35cf849a2216c1;hp=07fe1deb8ce531cd132a5b06a55f11ad1a500aab;hpb=520b2f3bb198bfbb88b90b058ef610f0a9b980c6;p=apps%2Fpfixtools.git

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index 07fe1de..34b4fbb 100644
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -45,6 +45,7 @@
 #include "config.h"
 
 #define DAEMON_NAME             "postlicyd"
+#define DAEMON_VERSION          "0.2"
 #define DEFAULT_PORT            10000
 #define RUNAS_USER              "nobody"
 #define RUNAS_GROUP             "nogroup"
@@ -103,7 +104,7 @@ static bool policy_process(server_t *pcy, const config_t *config)
             policy_answer(pcy, "%s", hook->value);
             return true;
         } else {
-            notice("request client=%s, from=<%s>, to=<%s>: "
+            debug("request client=%s, from=<%s>, to=<%s>: "
                    "awswer %s from filter %s: next filter %s",
                    query->client_name,
                    query->sender == NULL ? "undefined" : query->sender,
@@ -117,7 +118,7 @@ static bool policy_process(server_t *pcy, const config_t *config)
 
 static int policy_run(server_t *pcy, void* vconfig)
 {
-    ssize_t search_offs = MAX(0, (ssize_t)(pcy->ibuf.len - 1));
+    int search_offs = MAX(0, (int)(pcy->ibuf.len - 1));
     int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
     const char *eoq;
     query_t  *query  = pcy->data;
@@ -199,11 +200,22 @@ int main(int argc, char *argv[])
         }
     }
 
+    if (!daemonize) {
+        log_syslog = false;
+    }
+
     if (argc - optind != 1) {
         usage();
         return EXIT_FAILURE;
     }
 
+    info("starting %s v%s...", DAEMON_NAME, DAEMON_VERSION);
+
+    if (pidfile_open(pidfile) < 0) {
+        crit("unable to write pidfile %s", pidfile);
+        return EXIT_FAILURE;
+    }
+
     if (drop_privileges(RUNAS_USER, RUNAS_GROUP) < 0) {
         crit("unable to drop privileges");
         return EXIT_FAILURE;
@@ -217,14 +229,17 @@ int main(int argc, char *argv[])
         config->port = port;
     }
 
-    if (common_setup(pidfile, true, NULL, NULL, daemonize) != EXIT_SUCCESS
-        || start_listener(config->port) < 0) {
-        config_delete(&config);
+    if (daemonize && daemon_detach() < 0) {
+        crit("unable to fork");
+        return EXIT_FAILURE;
+    }
+
+    pidfile_refresh();
+
+    if (start_listener(config->port) < 0) {
         return EXIT_FAILURE;
     } else {
-        int res = server_loop(query_starter, (delete_client_t)query_delete,
-                              policy_run, config_refresh, config);
-        config_delete(&config);
-        return res;
+        return server_loop(query_starter, (delete_client_t)query_delete,
+                           policy_run, config_refresh, config);
     }
 }