diff --git a/include/struct.h b/include/struct.h index 5d0fd8aaa..a413a99b3 100644 --- a/include/struct.h +++ b/include/struct.h @@ -1870,7 +1870,7 @@ struct SecurityGroup { long connect_time; int webirc; int tls; - ConfigItem_mask *include_mask; + ConfigItem_mask *mask; NameList *security_group; /* Exclude */ int exclude_identified; diff --git a/src/conf.c b/src/conf.c index 827100a21..e2b46402b 100644 --- a/src/conf.c +++ b/src/conf.c @@ -10321,9 +10321,9 @@ int _conf_security_group(ConfigFile *conf, ConfigEntry *ce) else s->connect_time = config_checkval(cep->value, CFG_TIME); } - else if (!strcmp(cep->name, "include-mask")) + else if (!strcmp(cep->name, "mask") || !strcmp(cep->name, "include-mask")) { - unreal_add_masks(&s->include_mask, cep); + unreal_add_masks(&s->mask, cep); } else if (!strcmp(cep->name, "security-group")) { diff --git a/src/user.c b/src/user.c index e44a60902..03f49219c 100644 --- a/src/user.c +++ b/src/user.c @@ -806,7 +806,7 @@ SecurityGroup *add_security_group(const char *name, int priority) /** Free a SecurityGroup struct */ void free_security_group(SecurityGroup *s) { - unreal_delete_masks(s->include_mask); + unreal_delete_masks(s->mask); unreal_delete_masks(s->exclude_mask); free_entire_name_list(s->security_group); free_entire_name_list(s->exclude_security_group); @@ -950,7 +950,7 @@ int user_allowed_by_security_group(Client *client, SecurityGroup *s) } if (s->tls && (IsSecureConnect(client) || (MyConnect(client) && IsSecure(client)))) goto user_allowed; - if (s->include_mask && unreal_mask_match(client, s->include_mask)) + if (s->mask && unreal_mask_match(client, s->mask)) goto user_allowed; if (s->security_group && user_allowed_by_security_group_list(client, s->security_group)) goto user_allowed;