authd: when aborting, don't just do read_packet.

This commit is contained in:
Elizabeth Myers 2016-04-02 03:46:31 -05:00
parent 9bba0f6143
commit 6d5edc6f53

View file

@ -420,12 +420,12 @@ authd_decide_client(struct Client *client_p, const char *ident, const char *host
if(*host != '*') if(*host != '*')
rb_strlcpy(client_p->host, host, sizeof(client_p->host)); rb_strlcpy(client_p->host, host, sizeof(client_p->host));
rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(client_p->preClient->authd_cid));
client_p->preClient->authd_accepted = accept; client_p->preClient->authd_accepted = accept;
client_p->preClient->authd_cause = cause; client_p->preClient->authd_cause = cause;
client_p->preClient->authd_data = (data == NULL ? NULL : rb_strdup(data)); client_p->preClient->authd_data = (data == NULL ? NULL : rb_strdup(data));
client_p->preClient->authd_reason = (reason == NULL ? NULL : rb_strdup(reason)); client_p->preClient->authd_reason = (reason == NULL ? NULL : rb_strdup(reason));
rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(client_p->preClient->authd_cid));
client_p->preClient->authd_cid = 0; client_p->preClient->authd_cid = 0;
/* /*
@ -468,8 +468,7 @@ authd_abort_client(struct Client *client_p)
if(authd_helper != NULL) if(authd_helper != NULL)
rb_helper_write(authd_helper, "E %x", client_p->preClient->authd_cid); rb_helper_write(authd_helper, "E %x", client_p->preClient->authd_cid);
/* XXX should we blindly allow like this? */ client_p->preClient->authd_accepted = true;
authd_accept_client(client_p, "*", "*");
client_p->preClient->authd_cid = 0; client_p->preClient->authd_cid = 0;
} }