diff options
| -rw-r--r-- | src/protocol/inspircd11.c | 12 | ||||
| -rw-r--r-- | src/protocol/inspircd12.cpp | 18 | ||||
| -rw-r--r-- | src/protocol/unreal32.c | 1 |
3 files changed, 14 insertions, 17 deletions
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c index 49f85bb0b..42c51712b 100644 --- a/src/protocol/inspircd11.c +++ b/src/protocol/inspircd11.c @@ -188,10 +188,8 @@ class InspIRCdProto : public IRCDProto else --opcnt; break; case 'r': - if (add && !nick_identified(user)) { - common_svsmode(user, "-r", NULL); - user->RemoveMode(UMODE_REGISTERED); - } + if (add && !nick_identified(user)) + SendUnregisteredNick(user); break; case 'x': if (add && user->vhost) @@ -388,11 +386,11 @@ class InspIRCdProto : public IRCDProto send_cmd(ServerName, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason); } - /* SVSMODE +d */ - /* nc_change was = 1, and there is no na->status */ + /* SVSMODE +- */ void SendUnregisteredNick(User *u) { - common_svsmode(u, "-r", NULL); + if (u->HasMode(UMODE_REGISTERED)) + common_svsmode(u, "-r", NULL); } void SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp index 145434c46..a8e76dd39 100644 --- a/src/protocol/inspircd12.cpp +++ b/src/protocol/inspircd12.cpp @@ -198,10 +198,8 @@ class InspIRCdProto : public IRCDProto */ if (user->server->sync == SSYNC_IN_PROGRESS) break; - if (add && !nick_identified(user)) { - common_svsmode(user, "-r", NULL); - user->RemoveMode(UMODE_REGISTERED); - } + if (add && !nick_identified(user)) + SendUnregisteredNick(user); break; case 'x': if (add && user->vhost) @@ -401,11 +399,11 @@ class InspIRCdProto : public IRCDProto send_cmd(TS6SID, "ADDLINE Z %s %s %ld 0 :%s", mask, whom, static_cast<long>(time(NULL)), reason); } - /* SVSMODE +d */ - /* nc_change was = 1, and there is no na->status */ + /* SVSMODE -r */ void SendUnregisteredNick(User *u) { - common_svsmode(u, "-r", NULL); + if (u->HasMode(UMODE_REGISTERED)) + common_svsmode(u, "-r", NULL); } void SendSVSJoin(const char *source, const char *nick, const char *chan, const char *param) @@ -909,7 +907,8 @@ int anope_event_uid(const char *source, int ac, const char **av) if (user && user->server->sync == SSYNC_IN_PROGRESS && (!na || na->nc != user->nc)) { validate_user(user); - common_svsmode(user, "-r", NULL); + if (user->HasMode(UMODE_REGISTERED)) + common_svsmode(user, "-r", NULL); } user = NULL; @@ -1194,7 +1193,8 @@ int anope_event_endburst(const char *source, int ac, const char **av) if (u && u->server->sync == SSYNC_IN_PROGRESS && (!na || na->nc != u->nc)) { validate_user(u); - common_svsmode(u, "-r", NULL); + if (u->HasMode(UMODE_REGISTERED)) + common_svsmode(u, "-r", NULL); } alog("Processed ENDBURST for %s", s->name); diff --git a/src/protocol/unreal32.c b/src/protocol/unreal32.c index d8f60514d..46a94cbf8 100644 --- a/src/protocol/unreal32.c +++ b/src/protocol/unreal32.c @@ -214,7 +214,6 @@ class UnrealIRCdProto : public IRCDProto case 'r': if (add && !nick_identified(user)) { common_svsmode(user, "-r", NULL); - user->RemoveMode('r'); } break; case 't': |