authd: small cleanup

[solanum.git] / authd / authd.c

diff --git a/authd/authd.c b/authd/authd.c
index 1432a54587fc6b840785b42589cb4ebcbd206ab1..5218dc124e2a6bdd3e3bbb2f9cd1a281b33050e2 100644 (file)
--- a/authd/authd.c
+++ b/authd/authd.c
@@ -32,7 +32,8 @@ static void handle_options(int parc, char *parv[]);
 rb_helper *authd_helper = NULL;
 authd_cmd_handler authd_cmd_handlers[256] = {
        ['C'] = handle_new_connection,
-       ['D'] = resolve_dns,
+       ['D'] = handle_resolve_dns,
+       ['E'] = handle_cancel_connection,
        ['O'] = handle_options,
        ['R'] = handle_reload,
        ['S'] = handle_stat,
@@ -52,6 +53,7 @@ static void
 handle_stat(int parc, char *parv[])
 {
        authd_stat_handler handler;
+       long lrid;
 
        if(parc < 3)
        {
@@ -59,10 +61,16 @@ handle_stat(int parc, char *parv[])
                return;
        }
 
+       if((lrid = strtol(parv[1], NULL, 16)) > UINT32_MAX)
+       {
+               warn_opers(L_CRIT, "BUG: handle_stat got a rid that was too large: %lx", lrid);
+               return;
+       }
+
        if (!(handler = authd_stat_handlers[(unsigned char)parv[2][0]]))
                return;
 
-       handler(parv[1], parv[2][0]);
+       handler((uint32_t)lrid, parv[2][0]);
 }
 
 static void
@@ -70,9 +78,9 @@ handle_options(int parc, char *parv[])
 {
        struct auth_opts_handler *handler;
 
-       if(parc < 4)
+       if(parc < 3)
        {
-               warn_opers(L_CRIT, "BUG: handle_options received too few parameters (at least 4 expected, got %d)", parc);
+               warn_opers(L_CRIT, "BUG: handle_options received too few parameters (at least 3 expected, got %d)", parc);
                return;
        }
 
@@ -139,7 +147,7 @@ parse_request(rb_helper *helper)
 static void
 error_cb(rb_helper *helper)
 {
-       exit(1);
+       exit(EX_ERROR);
 }
 
 #ifndef _WIN32
@@ -179,6 +187,12 @@ setup_signals(void)
 #endif
 }
 
+static void
+do_exit(void)
+{
+       destroy_providers();
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -188,7 +202,7 @@ main(int argc, char *argv[])
        if(authd_helper == NULL)
        {
                fprintf(stderr, "authd is not meant to be invoked by end users\n");
-               exit(1);
+               exit(EX_ERROR);
        }
 
        rb_set_time();
@@ -200,9 +214,9 @@ main(int argc, char *argv[])
        init_providers();
        rb_init_prng(NULL, RB_PRNG_DEFAULT);
 
-       rb_helper_loop(authd_helper, 0);
+       atexit(do_exit);
 
-       destroy_providers();
+       rb_helper_loop(authd_helper, 0);
 
        return 0;
 }