Fix ounregnick access check.

[srvx.git] / src / nickserv.c

diff --git a/src/nickserv.c b/src/nickserv.c
index 26370cde0bda7755210f1fbe409303951b3b236d..54c6fbc194b62b8b62656315477efc8b04974583 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -2562,10 +2562,8 @@ static NICKSERV_FUNC(cmd_ounregnick)
        reply("NSMSG_NICK_NOT_REGISTERED", argv[1]);
        return 0;
     }
-    if (ni->owner->opserv_level >= user->handle_info->opserv_level) {
-       reply("MSG_USER_OUTRANKED", ni->nick);
-       return 0;
-    }
+    if (!oper_outranks(user, ni->owner))
+        return 0;
     reply("NSMSG_UNREGNICK_SUCCESS", ni->nick);
     delete_nick(ni);
     return 1;
@@ -3606,7 +3604,7 @@ nickserv_reclaim(struct userNode *user, struct nick_info *ni, enum reclaim_actio
         break;
     case RECLAIM_KILL:
         msg = user_find_message(user, "NSMSG_RECLAIM_KILL");
-        irc_kill(nickserv, user, msg);
+        DelUser(user, nickserv, 1, msg);
         break;
     }
 }