cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make use of the new default privset!!

This commit is contained in:
William Pitcock 2008-08-17 08:08:23 -05:00
parent 001f5f6731
commit 5a6d4202d1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/newconf.c
View File

@ -487,13 +487,9 @@ conf_set_privset_privs(void *data)
if (!set) if (!set)
{ {
conf_report_error("Warning -- unknown parent privilege set %s for %s; ignored.", yy_privset_extends, conf_cur_block_name); conf_report_error("Warning -- unknown parent privilege set %s for %s; assuming defaults", yy_privset_extends, conf_cur_block_name);
rb_free(yy_privset_extends); set = privilegeset_get("default");
rb_free(privs);
yy_privset_extends = NULL;
return;
} }
privilegeset_extend(set, conf_cur_block_name != NULL ? conf_cur_block_name : "<unknown>", privs, 0); privilegeset_extend(set, conf_cur_block_name != NULL ? conf_cur_block_name : "<unknown>", privs, 0);
@ -634,6 +630,9 @@ static void
conf_set_oper_privset(void *data) conf_set_oper_privset(void *data)
{ {
yy_oper->privset = privilegeset_get((char *) data); yy_oper->privset = privilegeset_get((char *) data);
if (!yy_oper->privset)
yy_oper->privset = privilegeset_get("default");
} }
static void static void