projects
/
apps
/
pfixtools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add event to interrupt the server_loop.
[apps/pfixtools.git]
/
postlicyd
/
main-postlicyd.c
diff --git
a/postlicyd/main-postlicyd.c
b/postlicyd/main-postlicyd.c
index
1f286eb
..
57e1e25
100644
(file)
--- a/
postlicyd/main-postlicyd.c
+++ b/
postlicyd/main-postlicyd.c
@@
-45,6
+45,7
@@
#include "config.h"
#define DAEMON_NAME "postlicyd"
#include "config.h"
#define DAEMON_NAME "postlicyd"
+#define DAEMON_VERSION "0.2"
#define DEFAULT_PORT 10000
#define RUNAS_USER "nobody"
#define RUNAS_GROUP "nogroup"
#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 {
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,
"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)
{
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, (in
t)(pcy->ibuf.len - 1));
int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
const char *eoq;
query_t *query = pcy->data;
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;
}
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;
if (drop_privileges(RUNAS_USER, RUNAS_GROUP) < 0) {
crit("unable to drop privileges");
return EXIT_FAILURE;
@@
-217,11
+229,17
@@
int main(int argc, char *argv[])
config->port = port;
}
config->port = port;
}
- if (common_setup(pidfile, true, NULL, NULL, daemonize) != EXIT_SUCCESS
- || start_listener(config->port) < 0) {
+ if (daemonize && daemon_detach() < 0) {
+ crit("unable to fork");
+ return EXIT_FAILURE;
+ }
+
+ pidfile_refresh();
+
+ if (start_listener(config->port) < 0) {
return EXIT_FAILURE;
} else {
return server_loop(query_starter, (delete_client_t)query_delete,
return EXIT_FAILURE;
} else {
return server_loop(query_starter, (delete_client_t)query_delete,
- policy_run, config_refresh, config);
+ policy_run,
NULL,
config_refresh, config);
}
}
}
}