authd: misc fixes

[solanum.git] / authd / providers / rdns.c

diff --git a/authd/providers/rdns.c b/authd/providers/rdns.c
index ddce08fbccf8f729aadb47dd7c428056c61cd718..e4f2430e3edc2824e29b996ce600a078ee7553c3 100644 (file)
--- a/authd/providers/rdns.c
+++ b/authd/providers/rdns.c
@@ -22,6 +22,7 @@
 #include "rb_commio.h"
 #include "authd.h"
 #include "provider.h"
+#include "notice.h"
 #include "res.h"
 #include "dns.h"
 
@@ -56,50 +57,6 @@ static struct ev_entry *timeout_ev;
 static EVH timeout_dns_queries_event;
 static int rdns_timeout = 15;
 
-
-bool client_dns_init(void)
-{
-       timeout_ev = rb_event_addish("timeout_dns_queries_event", timeout_dns_queries_event, NULL, 1);
-       return (timeout_ev != NULL);
-}
-
-void client_dns_destroy(void)
-{
-       struct auth_client *auth;
-       rb_dictionary_iter iter;
-
-       RB_DICTIONARY_FOREACH(auth, &iter, auth_clients)
-       {
-               if(auth->data[PROVIDER_RDNS] != NULL)
-                       client_fail(auth, REPORT_FAIL);
-       }
-
-       rb_event_delete(timeout_ev);
-}
-
-bool client_dns_start(struct auth_client *auth)
-{
-       struct user_query *query = rb_malloc(sizeof(struct user_query));
-
-       query->timeout = rb_current_time() + rdns_timeout;
-
-       auth->data[PROVIDER_RDNS] = query;
-
-       query->query = lookup_hostname(auth->c_ip, dns_answer_callback, auth);
-
-       notice_client(auth, messages[REPORT_LOOKUP]);
-       set_provider_on(auth, PROVIDER_RDNS);
-       return true;
-}
-
-void client_dns_cancel(struct auth_client *auth)
-{
-       struct user_query *query = auth->data[PROVIDER_RDNS];
-
-       if(query != NULL)
-               client_fail(auth, REPORT_FAIL);
-}
-
 static void
 dns_answer_callback(const char *res, bool status, query_type type, void *data)
 {
@@ -118,7 +75,8 @@ dns_answer_callback(const char *res, bool status, query_type type, void *data)
 }
 
 /* Timeout outstanding queries */
-static void timeout_dns_queries_event(void *notused)
+static void
+timeout_dns_queries_event(void *notused)
 {
        struct auth_client *auth;
        rb_dictionary_iter iter;
@@ -135,7 +93,8 @@ static void timeout_dns_queries_event(void *notused)
        }
 }
 
-static void client_fail(struct auth_client *auth, dns_message report)
+static void
+client_fail(struct auth_client *auth, dns_message report)
 {
        struct user_query *query = auth->data[PROVIDER_RDNS];
 
@@ -144,7 +103,7 @@ static void client_fail(struct auth_client *auth, dns_message report)
 
        rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));
 
-       notice_client(auth, messages[report]);
+       notice_client(auth->cid, messages[report]);
        cancel_query(query->query);
 
        rb_free(query);
@@ -153,11 +112,12 @@ static void client_fail(struct auth_client *auth, dns_message report)
        provider_done(auth, PROVIDER_RDNS);
 }
 
-static void client_success(struct auth_client *auth)
+static void
+client_success(struct auth_client *auth)
 {
        struct user_query *query = auth->data[PROVIDER_RDNS];
 
-       notice_client(auth, messages[REPORT_FOUND]);
+       notice_client(auth->cid, messages[REPORT_FOUND]);
        cancel_query(query->query);
 
        rb_free(query);
@@ -166,12 +126,80 @@ static void client_success(struct auth_client *auth)
        provider_done(auth, PROVIDER_RDNS);
 }
 
+static bool
+rdns_init(void)
+{
+       timeout_ev = rb_event_addish("timeout_dns_queries_event", timeout_dns_queries_event, NULL, 1);
+       return (timeout_ev != NULL);
+}
+
+static void
+rdns_destroy(void)
+{
+       struct auth_client *auth;
+       rb_dictionary_iter iter;
+
+       RB_DICTIONARY_FOREACH(auth, &iter, auth_clients)
+       {
+               if(auth->data[PROVIDER_RDNS] != NULL)
+                       client_fail(auth, REPORT_FAIL);
+       }
+
+       rb_event_delete(timeout_ev);
+}
+
+static bool
+rdns_start(struct auth_client *auth)
+{
+       struct user_query *query = rb_malloc(sizeof(struct user_query));
+
+       query->timeout = rb_current_time() + rdns_timeout;
+
+       auth->data[PROVIDER_RDNS] = query;
+
+       query->query = lookup_hostname(auth->c_ip, dns_answer_callback, auth);
+
+       notice_client(auth->cid, messages[REPORT_LOOKUP]);
+       set_provider_on(auth, PROVIDER_RDNS);
+       return true;
+}
+
+static void
+rdns_cancel(struct auth_client *auth)
+{
+       struct user_query *query = auth->data[PROVIDER_RDNS];
+
+       if(query != NULL)
+               client_fail(auth, REPORT_FAIL);
+}
+
+static void
+add_conf_dns_timeout(const char *key, int parc, const char **parv)
+{
+       int timeout = atoi(parv[0]);
+
+       if(timeout < 0)
+       {
+               warn_opers(L_CRIT, "BUG: DNS timeout < 0 (value: %d)", timeout);
+               return;
+       }
+
+       rdns_timeout = timeout;
+}
+
+struct auth_opts_handler rdns_options[] =
+{
+       { "rdns_timeout", 1, add_conf_dns_timeout },
+       { NULL, 0, NULL },
+};
+
 struct auth_provider rdns_provider =
 {
        .id = PROVIDER_RDNS,
-       .init = client_dns_init,
-       .destroy = client_dns_destroy,
-       .start = client_dns_start,
-       .cancel = client_dns_cancel,
+       .init = rdns_init,
+       .destroy = rdns_destroy,
+       .start = rdns_start,
+       .cancel = rdns_cancel,
        .completed = NULL,
+       .opt_handlers = rdns_options,
 };