diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nickserv.c | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/src/nickserv.c b/src/nickserv.c index b2c95d469..f1a9e818d 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -837,38 +837,31 @@ void cancel_user(User * u) { NickAlias *na = u->na; - if (na) { - if (na->status & NS_GUESTED) { - if (ircd->svshold) { - if (ircd->svshold) { - ircdproto->SendSVSHold(na->nick); - } else { - if (ircd->svsnick) { - ircdproto->SendClientIntroduction(u->nick, NSEnforcerUser, - NSEnforcerHost, - "Services Enforcer", "+", ts6_uid_retrieve()); - add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout); - } else { - ircdproto->SendSVSKill(s_NickServ, u->nick, - "Killing to enforce nick"); - } - } - } else { - if (ircd->svsnick) { - ircdproto->SendClientIntroduction(u->nick, NSEnforcerUser, - NSEnforcerHost, - "Services Enforcer", "+", ts6_uid_retrieve()); - add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout); - } else { - ircdproto->SendSVSKill(s_NickServ, u->nick, - "Killing to enforce nick"); - } + if (na) + { + if (na->status & NS_GUESTED) + { + if (ircd->svshold) + { + ircdproto->SendSVSHold(na->nick); + } + else if (ircd->svsnick) + { + ircdproto->SendClientIntroduction(u->nick, NSEnforcerUser, NSEnforcerHost, "Services Enforcer", "+", ts6_uid_retrieve()); + add_ns_timeout(na, TO_RELEASE, NSReleaseTimeout); + } + else + { + ircdproto->SendSVSKill(s_NickServ, u->nick, "Please do not use a registered nickname without identifying"); } na->status &= ~NS_TEMPORARY; na->status |= NS_KILL_HELD; - } else { + } + else + { na->status &= ~NS_TEMPORARY; } + del_ns_timeout(na, TO_COLLIDE); } } |