wsockd: implement reading of small and large frames (but not huge frames)

[solanum.git] / authd / provider.c

diff --git a/authd/provider.c b/authd/provider.c
index f6413c4dc46db8b4d179774574900800fea797de..8288f295f4fafa61d39d5fe137cf034f4dc68be6 100644 (file)
--- a/authd/provider.c
+++ b/authd/provider.c
@@ -86,7 +86,7 @@ load_provider(struct auth_provider *provider)
        if(provider->init != NULL)
                provider->init();
 
-       rb_dlinkAdd(provider, &provider->node, &auth_providers);
+       rb_dlinkAddTail(provider, &provider->node, &auth_providers);
 }
 
 void
@@ -118,6 +118,7 @@ init_providers(void)
        load_provider(&rdns_provider);
        load_provider(&ident_provider);
        load_provider(&blacklist_provider);
+       load_provider(&opm_provider);
 }
 
 /* Terminate all providers */
@@ -214,6 +215,9 @@ reject_client(struct auth_client *auth, provider_t id, const char *data, const c
        case PROVIDER_BLACKLIST:
                reject = 'B';
                break;
+       case PROVIDER_OPM:
+               reject = 'O';
+               break;
        default:
                reject = 'N';
                break;
@@ -271,24 +275,12 @@ start_auth(const char *cid, const char *l_ip, const char *l_port, const char *c_
        rb_strlcpy(auth->l_ip, l_ip, sizeof(auth->l_ip));
        auth->l_port = (uint16_t)atoi(l_port);  /* should be safe */
        (void) rb_inet_pton_sock(l_ip, (struct sockaddr *)&auth->l_addr);
+       SET_SS_PORT(&auth->l_addr, htons(auth->l_port));
 
        rb_strlcpy(auth->c_ip, c_ip, sizeof(auth->c_ip));
        auth->c_port = (uint16_t)atoi(c_port);
        (void) rb_inet_pton_sock(c_ip, (struct sockaddr *)&auth->c_addr);
-
-#ifdef RB_IPV6
-       if(GET_SS_FAMILY(&auth->l_addr) == AF_INET6)
-               ((struct sockaddr_in6 *)&auth->l_addr)->sin6_port = htons(auth->l_port);
-       else
-#endif
-               ((struct sockaddr_in *)&auth->l_addr)->sin_port = htons(auth->l_port);
-
-#ifdef RB_IPV6
-       if(GET_SS_FAMILY(&auth->c_addr) == AF_INET6)
-               ((struct sockaddr_in6 *)&auth->c_addr)->sin6_port = htons(auth->c_port);
-       else
-#endif
-               ((struct sockaddr_in *)&auth->c_addr)->sin_port = htons(auth->c_port);
+       SET_SS_PORT(&auth->c_addr, htons(auth->c_port));
 
        rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));
        rb_strlcpy(auth->username, "*", sizeof(auth->username));
@@ -350,8 +342,9 @@ handle_cancel_connection(int parc, char *parv[])
 
        if((auth = rb_dictionary_retrieve(auth_clients, RB_UINT_TO_POINTER((uint32_t)lcid))) == NULL)
        {
-               warn_opers(L_CRIT, "provider: tried to cancel nonexistent connection %lx", lcid);
-               exit(EX_PROVIDER_ERROR);
+               /* This could happen as a race if we've accepted/rejected but they cancel, so don't die here.
+                * --Elizafox */
+               return;
        }
 
        cancel_providers(auth);