Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow Blocks Order Issue 189 #208

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Allow Blocks Order Issue 189 #208

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b2bfff2
Allow Blocks Order Issue 189
holbrookb Apr 5, 2022
cdd01d2
Update s_conf.c
holbrookb Apr 5, 2022
e86b670
Update s_conf.c
holbrookb Apr 5, 2022
cb1d33d
Merge branch 'master' into allow_order_issue189
eaescob Dec 1, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1866,6 +1866,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 @@ -2226,7 +2245,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
Loading