X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=main-postlicyd.c;h=febc1e294d5d24e7e488291b5056046cfbcb2670;hb=881732b600190bc02b9dde47980b14382851c266;hp=b9f83731b1b7c1129aededbae3a6f280248752d1;hpb=975966c9fa3e2d111ed03d127e8d49e7064ed02d;p=apps%2Fpfixtools.git

diff --git a/main-postlicyd.c b/main-postlicyd.c
index b9f8373..febc1e2 100644
--- a/main-postlicyd.c
+++ b/main-postlicyd.c
@@ -31,6 +31,7 @@
 
 /*
  * Copyright © 2006-2007 Pierre Habouzit
+ * Copyright © 2008 Florent Bruneau
  */
 
 #include <getopt.h>
@@ -46,6 +47,8 @@
 #define RUNAS_USER              "nobody"
 #define RUNAS_GROUP             "nogroup"
 
+DECLARE_MAIN
+
 enum smtp_state {
     SMTP_UNKNOWN,
     SMTP_CONNECT,
@@ -92,7 +95,7 @@ typedef struct query_t {
     const char *eoq;
 } query_t;
 
-static query_t *query_new()
+static query_t *query_new(void)
 {
     return p_new(query_t, 1);
 }
@@ -104,6 +107,11 @@ static void query_delete(query_t **query)
     }
 }
 
+static void *query_starter(server_t* server)
+{
+    return query_new();
+}
+
 static int postfix_parsejob(query_t *query, char *p)
 {
 #define PARSE_CHECK(expr, error, ...)                                        \
@@ -251,26 +259,6 @@ int start_listener(int port)
 
 /* administrivia {{{ */
 
-static int main_initialize(void)
-{
-    openlog("postlicyd", LOG_PID, LOG_MAIL);
-    signal(SIGPIPE, SIG_IGN);
-    signal(SIGINT,  &common_sighandler);
-    signal(SIGTERM, &common_sighandler);
-    signal(SIGHUP,  &common_sighandler);
-    signal(SIGSEGV, &common_sighandler);
-    syslog(LOG_INFO, "Starting...");
-    return 0;
-}
-
-static void main_shutdown(void)
-{
-    closelog();
-}
-
-module_init(main_initialize);
-module_exit(main_shutdown);
-
 void usage(void)
 {
     fputs("usage: "DAEMON_NAME" [options] config\n"
@@ -312,29 +300,14 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
 
-    if (pidfile_open(pidfile) < 0) {
-        syslog(LOG_CRIT, "unable to write pidfile %s", pidfile);
-        return EXIT_FAILURE;
-    }
-
-    if (drop_privileges(RUNAS_USER, RUNAS_GROUP) < 0) {
-        syslog(LOG_CRIT, "unable to drop privileges");
+    if (common_setup(pidfile, false, RUNAS_USER, RUNAS_GROUP, daemonize)
+          != EXIT_SUCCESS) {
         return EXIT_FAILURE;
     }
 
-    if (daemonize && daemon_detach() < 0) {
-        syslog(LOG_CRIT, "unable to fork");
-        return EXIT_FAILURE;
-    }
-
-    pidfile_refresh();
-
     if (start_listener(port) < 0)
         return EXIT_FAILURE;
 
-    (void)server_loop((start_client_t)query_new, (delete_client_t)query_delete,
-                      policy_run, NULL);
-
-    syslog(LOG_INFO, "Stopping...");
-    return EXIT_SUCCESS;
+    return server_loop(query_starter, (delete_client_t)query_delete,
+                       policy_run, NULL);
 }