Merge branch 'main' into dwfreed/callerid-cleanup

dwfreed · web-flow · commit 529aef664911 · 2022-11-09T10:03:47.000-06:00
diff --git a/ircd/authproc.c b/ircd/authproc.c
@@ -566,7 +566,6 @@ timeout_dead_authd_clients(void *notused __unused)
 	{
 		if(client_p->preClient->auth.timeout < rb_current_time())
 		{
-			authd_free_client(client_p);
 			rb_dlinkAddAlloc(client_p, &freelist);
 		}
 	}
@@ -575,7 +574,8 @@ timeout_dead_authd_clients(void *notused __unused)
 	RB_DLINK_FOREACH_SAFE(ptr, nptr, freelist.head)
 	{
 		client_p = ptr->data;
-		rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(client_p->preClient->auth.cid));
+		authd_abort_client(client_p);
+		rb_dlinkDestroy(ptr, &freelist);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -566,7 +566,6 @@ timeout_dead_authd_clients(void *notused __unused)`
`566`	`566`	`{`
`567`	`567`	`if(client_p->preClient->auth.timeout < rb_current_time())`
`568`	`568`	`{`
`569`		`- authd_free_client(client_p);`
`570`	`569`	`rb_dlinkAddAlloc(client_p, &freelist);`
`571`	`570`	`}`
`572`	`571`	`}`
`@@ -575,7 +574,8 @@ timeout_dead_authd_clients(void *notused __unused)`
`575`	`574`	`RB_DLINK_FOREACH_SAFE(ptr, nptr, freelist.head)`
`576`	`575`	`{`
`577`	`576`	`client_p = ptr->data;`
`578`		`- rb_dictionary_delete(cid_clients, RB_UINT_TO_POINTER(client_p->preClient->auth.cid));`
	`577`	`+ authd_abort_client(client_p);`
	`578`	`+ rb_dlinkDestroy(ptr, &freelist);`
`579`	`579`	`}`
`580`	`580`	`}`
`581`	`581`