diff options
| -rw-r--r-- | data/example.conf | 5 | ||||
| -rw-r--r-- | include/extern.h | 1 | ||||
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 9 |
4 files changed, 3 insertions, 14 deletions
diff --git a/data/example.conf b/data/example.conf index f772b1d6b..b791a9793 100644 --- a/data/example.conf +++ b/data/example.conf @@ -582,11 +582,6 @@ GlobalOnCycleUP "Services are now back online - have a nice day" # the first time. #RestrictOperNicks -# UseSVS2MODE [OPTIONAL] -# On Unreal IRCD use SVS2MODE instead of SVSMODE, doing this will -# show services changing user modes. -#UseSVS2MODE - # NewsCount [OPTIONAL] # The number of LOGON/OPER News item to display when a user logs # on. The default value is 3 diff --git a/include/extern.h b/include/extern.h index f5efbcdb8..9aa5292c3 100644 --- a/include/extern.h +++ b/include/extern.h @@ -301,7 +301,6 @@ E int DumpCore; E int LogUsers; E int NickRegDelay; E int UseSVSHOLD; -E int UseSVS2MODE; E int RestrictOperNicks; E int NewsCount; E char *Numeric; diff --git a/src/config.c b/src/config.c index 1d91b2456..ae61ff0c1 100644 --- a/src/config.c +++ b/src/config.c @@ -103,7 +103,6 @@ int DumpCore; int LogUsers; int NickRegDelay; int UseSVSHOLD; -int UseSVS2MODE; int NewsCount; int UseMail; @@ -1354,7 +1353,6 @@ Directive directives[] = { {"UserKey2", {{PARAM_POSINT, PARAM_RELOAD, &UserKey2}}}, {"UserKey3", {{PARAM_POSINT, PARAM_RELOAD, &UserKey3}}}, {"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}}, - {"UseSVS2MODE", {{PARAM_SET, PARAM_RELOAD, &UseSVS2MODE}}}, {"UseTS6", {{PARAM_SET, 0, &UseTS6}}}, {"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}}, {"WarningTimeout", {{PARAM_TIME, PARAM_RELOAD, &WarningTimeout}}}, diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index 223a951c9..8f1a31549 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -603,8 +603,7 @@ class UnrealIRCdProto : public IRCDProto void SendVhostDel(User *u) { - if (UseSVS2MODE) send_cmd(s_HostServ, "v %s -xt", u->nick); - else send_cmd(s_HostServ, "n %s -xt", u->nick); + send_cmd(s_HostServ, "v %s -xt", u->nick); notice_lang(s_HostServ, u, HOST_OFF_UNREAL, u->nick, myIrcd->vhostchar); } @@ -639,8 +638,7 @@ class UnrealIRCdProto : public IRCDProto { if (ac >= 1) { if (!u || !av[0]) return; - if (UseSVS2MODE) send_cmd(ServerName, "v %s %s", u->nick, merge_args(ac, av)); - else send_cmd(ServerName, "n %s %s", u->nick, merge_args(ac, av)); + send_cmd(ServerName, "v %s %s", u->nick, merge_args(ac, av)); } } @@ -820,8 +818,7 @@ class UnrealIRCdProto : public IRCDProto /* sent if svid is something weird */ void SendSVID(const char *nick, time_t ts) { - if (UseSVS2MODE) send_cmd(ServerName, "v %s +d 1", nick); - else send_cmd(ServerName, "n %s +d 1", nick); + send_cmd(ServerName, "v %s +d 1", nick); } /* SVSMODE +d */ |