Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions src/s_conf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1876,6 +1876,25 @@ set_classes(void)
return NULL;
}

void remove_allows()
{
aAllow *allow = allows, *ptr = NULL;

while (allow)
{
ptr = allow->next;
allows = allow->next;

allow->class->refs--;
expire_class(allow->class);
free_allow(allow);

allow = ptr;
}

MyFree(allows);
return;
}

/* merge routines. used to mirge together new lists and old lists
* after a rehash. Feb27/04 -epi
Expand Down Expand Up @@ -2236,7 +2255,11 @@ merge_confs()
merge_classes(); /* this should always be done first */
merge_me();
merge_connects();

// Clear out current allow blocks first, then add them all back from ircd.conf -Holbrook
remove_allows();
merge_allows();

merge_opers();
merge_ports();
merge_options();
Expand Down