diff options
| -rw-r--r-- | src/core/ns_recover.c | 2 | ||||
| -rw-r--r-- | src/nickserv.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index 3a0a9cedd..23b284e46 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -26,7 +26,7 @@ class CommandNSRecover : public Command CommandReturn Execute(User *u, const std::vector<ci::string> ¶ms) { const char *nick = params[0].c_str(); - std::string pass = params.size() > 1 ? params[1].c_str() : NULL; + std::string pass = params.size() > 1 ? params[1].c_str() : ""; NickAlias *na; User *u2; diff --git a/src/nickserv.c b/src/nickserv.c index 7cb98c121..b9e39fac7 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -363,11 +363,9 @@ void cancel_user(User * u) ircdproto->SendSVSKill(findbot(Config.s_NickServ), u, "Please do not use a registered nickname without identifying"); } na->SetFlag(NS_KILL_HELD); + na->UnsetFlag(NS_GUESTED); } - na->UnsetFlag(NS_KILL_HELD); - na->UnsetFlag(NS_GUESTED); - NickServCollide::ClearTimers(na); } } |