Close the listeners on exit.

[apps/pfixtools.git] / main-postlicyd.c

diff --git a/main-postlicyd.c b/main-postlicyd.c
index febc1e2..deb90b3 100644 (file)
--- a/main-postlicyd.c
+++ b/main-postlicyd.c
@@ -84,7 +84,7 @@ typedef struct query_t {
     const char *size;
     const char *ccert_subject;
     const char *ccert_issuer;
-    const char *ccsert_fingerprint;
+    const char *ccert_fingerprint;
 
     /* postfix 2.3+ */
     const char *encryption_protocol;
@@ -92,6 +92,9 @@ typedef struct query_t {
     const char *encryption_keysize;
     const char *etrn_domain;
 
+    /* postfix 2.5+ */
+    const char *stress;
+
     const char *eoq;
 } query_t;
 
@@ -159,11 +162,12 @@ static int postfix_parsejob(query_t *query, char *p)
             CASE(SIZE,                size);
             CASE(CCERT_SUBJECT,       ccert_subject);
             CASE(CCERT_ISSUER,        ccert_issuer);
-            CASE(CCSERT_FINGERPRINT,  ccsert_fingerprint);
+            CASE(CCERT_FINGERPRINT,   ccert_fingerprint);
             CASE(ENCRYPTION_PROTOCOL, encryption_protocol);
             CASE(ENCRYPTION_CIPHER,   encryption_cipher);
             CASE(ENCRYPTION_KEYSIZE,  encryption_keysize);
             CASE(ETRN_DOMAIN,         etrn_domain);
+            CASE(STRESS,              stress);
 #undef CASE
 
           case PTK_REQUEST:
@@ -198,7 +202,7 @@ static int postfix_parsejob(query_t *query, char *p)
 
           default:
             syslog(LOG_WARNING, "unexpected key, skipped: %.*s", klen, k);
-            break;
+            continue;
         }
     }
 
@@ -210,17 +214,28 @@ __attribute__((format(printf,2,0)))
 static void policy_answer(server_t *pcy, const char *fmt, ...)
 {
     va_list args;
+    const query_t* query = pcy->data;
+
+    buffer_addstr(&pcy->obuf, "action=");
     va_start(args, fmt);
     buffer_addvf(&pcy->obuf, fmt, args);
     va_end(args);
     buffer_addstr(&pcy->obuf, "\n\n");
-    buffer_consume(&pcy->ibuf, ((query_t*)(pcy->data))->eoq - pcy->ibuf.data);
+    buffer_consume(&pcy->ibuf, query->eoq - pcy->ibuf.data);
     epoll_modify(pcy->fd, EPOLLIN | EPOLLOUT, pcy);
 }
 
+static bool policy_run_filter(const query_t* query, void* filter, void* conf)
+{
+    return false;
+}
+
 static void policy_process(server_t *pcy)
 {
-    policy_answer(pcy, "DUNNO");
+    const query_t* query = pcy->data;
+    if (!policy_run_filter(query, NULL, NULL)) {
+        policy_answer(pcy, "DUNNO");
+    }
 }
 
 static int policy_run(server_t *pcy, void* config)
@@ -228,6 +243,7 @@ static int policy_run(server_t *pcy, void* config)
     ssize_t search_offs = MAX(0, pcy->ibuf.len - 1);
     int nb = buffer_read(&pcy->ibuf, pcy->fd, -1);
     const char *eoq;
+    query_t* query = pcy->data;
 
     if (nb < 0) {
         if (errno == EAGAIN || errno == EINTR)
@@ -246,7 +262,7 @@ static int policy_run(server_t *pcy, void* config)
 
     if (postfix_parsejob(pcy->data, pcy->ibuf.data) < 0)
         return -1;
-    ((query_t*)pcy->data)->eoq = eoq + strlen("\n\n");
+    query->eoq = eoq + strlen("\n\n");
     epoll_modify(pcy->fd, 0, pcy);
     policy_process(pcy);
     return 0;
@@ -274,6 +290,7 @@ void usage(void)
 
 int main(int argc, char *argv[])
 {
+    bool unsafe = false;
     const char *pidfile = NULL;
     bool daemonize = true;
     int port = DEFAULT_PORT;
@@ -283,6 +300,9 @@ int main(int argc, char *argv[])
           case 'p':
             pidfile = optarg;
             break;
+          case 'u':
+            unsafe = true;
+            break;
           case 'l':
             port = atoi(optarg);
             break;
@@ -300,14 +320,11 @@ int main(int argc, char *argv[])
         return EXIT_FAILURE;
     }
 
-    if (common_setup(pidfile, false, RUNAS_USER, RUNAS_GROUP, daemonize)
-          != EXIT_SUCCESS) {
+    if (common_setup(pidfile, false, RUNAS_USER, RUNAS_GROUP,
+                     daemonize) != EXIT_SUCCESS
+        || start_listener(port) < 0) {
         return EXIT_FAILURE;
     }
-
-    if (start_listener(port) < 0)
-        return EXIT_FAILURE;
-
     return server_loop(query_starter, (delete_client_t)query_delete,
                        policy_run, NULL);
 }