diff options
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | src/config.c | 9 | ||||
| -rw-r--r-- | src/protocol/bahamut.c | 7 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 7 |
4 files changed, 5 insertions, 19 deletions
diff --git a/include/extern.h b/include/extern.h index 5d2afe5c9..aa7e425a6 100644 --- a/include/extern.h +++ b/include/extern.h @@ -304,7 +304,6 @@ E int UseSVSHOLD; E bool RestrictOperNicks; E int NewsCount; E char *Numeric; -E int UnRestrictSAdmin; E int UseTS6; E char **HostSetters; diff --git a/src/config.c b/src/config.c index 54aa6adb1..7f741d60e 100644 --- a/src/config.c +++ b/src/config.c @@ -293,10 +293,7 @@ long unsigned int UserKey2; long unsigned int UserKey3; char *Numeric; - -int UnRestrictSAdmin; - -static char *UlineServers; +char *UlineServers; char **Ulines; int NumUlines; @@ -1396,7 +1393,11 @@ Directive directives[] = { {PARAM_STRING, 0, &RemotePassword3}}}, {"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}}, {"UseTS6", {{PARAM_SET, 0, &UseTS6}}}, +<<<<<<< HEAD:src/config.c {"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}}, +======= + {"UlineServers", {{PARAM_STRING, PARAM_RELOAD, &UlineServers}}}, +>>>>>>> Remove UnRestrictSAdmin.:src/config.c }; /*************************************************************************/ diff --git a/src/protocol/bahamut.c b/src/protocol/bahamut.c index d26379aa9..9effddb20 100644 --- a/src/protocol/bahamut.c +++ b/src/protocol/bahamut.c @@ -488,13 +488,6 @@ class BahamutIRCdProto : public IRCDProto case '-': add = 0; break; - case 'a': - if (UnRestrictSAdmin) break; - if (add && !is_services_admin(user)) { - common_svsmode(user, "-a", NULL); - user->mode &= ~UMODE_a; - } - break; case 'd': if (!ac) { alog("user: umode +d with no parameter (?) for user %s", user->nick); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index ab52ddf43..5a820f3aa 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -565,13 +565,6 @@ class UnrealIRCdProto : public IRCDProto } else --opcnt; break; - case 'a': - if (UnRestrictSAdmin) break; - if (add && !is_services_admin(user)) { - common_svsmode(user, "-a", NULL); - user->mode &= ~UMODE_a; - } - break; case 'r': if (add && !nick_identified(user)) { common_svsmode(user, "-r", NULL); |