X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=postlicyd%2Fquery.c;h=26b590a878e0b3118fa0cf51803cf80c274d4895;hb=520b2f3bb198bfbb88b90b058ef610f0a9b980c6;hp=1dc8e6f12bc9a7dc8cc5992577ed0f83fbaff707;hpb=e6d0c7ab6103af206f95c1291b29c3f151a41484;p=apps%2Fpfixtools.git diff --git a/postlicyd/query.c b/postlicyd/query.c index 1dc8e6f..26b590a 100644 --- a/postlicyd/query.c +++ b/postlicyd/query.c @@ -42,7 +42,7 @@ bool query_parse(query_t *query, char *p) #define PARSE_CHECK(expr, error, ...) \ do { \ if (!(expr)) { \ - syslog(LOG_ERR, error, ##__VA_ARGS__); \ + err(error, ##__VA_ARGS__); \ return false; \ } \ } while (0) @@ -69,7 +69,7 @@ bool query_parse(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'; syslog(LOG_DEBUG, "%s = %s", ptokens[PTK_##up], query->low); break; +#define CASE(up, low) case PTK_##up: query->low = v; v[vlen] = '\0'; break; CASE(HELO_NAME, helo_name); CASE(QUEUE_ID, queue_id); CASE(SENDER, sender); @@ -124,7 +124,7 @@ bool query_parse(query_t *query, char *p) break; default: - syslog(LOG_WARNING, "unexpected key, skipped: %.*s", klen, k); + warn("unexpected key, skipped: %.*s", klen, k); continue; } }