X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fmain-postlicyd.c;h=e75965f0a703c2c630f6e905c52f13ca643a4514;hb=9fc48ba2176a71585c13cd346968bdba499e80de;hp=ad6102908c37f83932b2b443db47eb8715f02c89;hpb=86bf8f7a016cfd8475ffc363a4cac0a29a4aacfd;p=apps%2Fpfixtools.git

diff --git a/postlicyd/main-postlicyd.c b/postlicyd/main-postlicyd.c
index ad61029..e75965f 100644
--- a/postlicyd/main-postlicyd.c
+++ b/postlicyd/main-postlicyd.c
@@ -67,6 +67,7 @@ static int postfix_parsejob(query_t *query, char *p)
     } while (0)
 
     p_clear(query, 1);
+    query->state = SMTP_UNKNOWN;
     while (*p != '\n') {
         char *k, *v;
         int klen, vlen, vtk;
@@ -87,7 +88,7 @@ static int postfix_parsejob(query_t *query, char *p)
 
         vtk = policy_tokenize(v, vlen);
         switch (policy_tokenize(k, klen)) {
-#define CASE(up, low)  case PTK_##up: query->low = v; v[vlen] = '\0'; break;
+#define CASE(up, low)  case PTK_##up: query->low = v; v[vlen] = '\0'; syslog(LOG_DEBUG, "%s = %s", ptokens[PTK_##up], query->low); break;
             CASE(HELO_NAME,           helo_name);
             CASE(QUEUE_ID,            queue_id);
             CASE(SENDER,              sender);
@@ -169,7 +170,13 @@ static void policy_answer(server_t *pcy, const char *fmt, ...)
 static void policy_process(server_t *pcy, config_t *config)
 {
     const query_t* query = pcy->data;
-    filter_t *filter = array_ptr(config->filters, config->entry_point);
+    filter_t *filter;
+    if (config->entry_points[query->state] == -1) {
+        syslog(LOG_WARNING, "no filter defined for current protocol_state (%d)", query->state);
+        policy_answer(pcy, "DUNNO");
+        return;
+    }
+    filter = array_ptr(config->filters, config->entry_points[query->state]);
     while (true) {
         filter_hook_t *hook = filter_run(filter, query);
         if (hook == NULL) {
@@ -277,6 +284,10 @@ int main(int argc, char *argv[])
         || start_listener(port) < 0) {
         return EXIT_FAILURE;
     }
-    return server_loop(query_starter, (delete_client_t)query_delete,
-                       policy_run, NULL);
+    {
+        int res = server_loop(query_starter, (delete_client_t)query_delete,
+                              policy_run, config);
+        config_delete(&config);
+        return res;
+    }
 }