Merge branch 'master' into authd-framework-2

[solanum.git] / authd / authd.c

diff --git a/authd/authd.c b/authd/authd.c
index 937160f9109f4762b92195803cdea20ab127fbed..335f55f51f15fe7b8466b23f28e9f05727ef1122 100644 (file)
--- a/authd/authd.c
+++ b/authd/authd.c
@@ -20,6 +20,7 @@
 
 #include "authd.h"
 #include "dns.h"
+#include "provider.h"
 
 #define MAXPARA 10
 
@@ -28,8 +29,9 @@ static void handle_stat(int parc, char *parv[]);
 
 rb_helper *authd_helper = NULL;
 authd_cmd_handler authd_cmd_handlers[256] = {
-       ['H'] = handle_reload,
+       ['C'] = handle_new_connection,
        ['D'] = resolve_dns,
+       ['H'] = handle_reload,
        ['S'] = handle_stat,
 };
 
@@ -50,7 +52,7 @@ handle_stat(int parc, char *parv[])
                 /* XXX Should log this somehow */
                return;
 
-       if (!(handler = authd_stat_handlers[parv[2][0]]))
+       if (!(handler = authd_stat_handlers[(unsigned char)parv[2][0]]))
                return;
 
        handler(parv[1], parv[2][0]);
@@ -65,7 +67,7 @@ handle_reload(int parc, char *parv[])
                 /* XXX Should log this somehow */
                return;
 
-       if (!(handler = authd_reload_handlers[parv[1][0]]))
+       if (!(handler = authd_reload_handlers[(unsigned char)parv[1][0]]))
                return;
 
        handler(parv[1][0]);
@@ -87,7 +89,7 @@ parse_request(rb_helper *helper)
                if(parc < 1)
                        continue;
 
-               handler = authd_cmd_handlers[parv[0][0]];
+               handler = authd_cmd_handlers[(unsigned char)parv[0][0]];
                if (handler != NULL)
                        handler(parc, parv);
        }
@@ -151,6 +153,7 @@ main(int argc, char *argv[])
        rb_set_time();
        setup_signals();
        init_resolver();
+       init_providers();
        rb_init_prng(NULL, RB_PRNG_DEFAULT);
 
        rb_helper_loop(authd_helper, 0);