X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=9bdc391ca7c6d57a72bfd809c4c342b939673d01;hb=59b8220d0227fe68537a563b3e5fa2e63e26bc0d;hp=07fe1deb8ce531cd132a5b06a55f11ad1a500aab;hpb=520b2f3bb198bfbb88b90b058ef610f0a9b980c6;p=apps%2Fpfixtools.git diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c index 07fe1de..9bdc391 100644 --- a/postlicyd/main-postlicyd.c +++ b/postlicyd/main-postlicyd.c @@ -117,7 +117,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; @@ -204,6 +204,11 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; } + 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 +222,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); } }