Unify oper:{global,local}_kill

[solanum.git] / modules / core / m_kill.c

diff --git a/modules/core/m_kill.c b/modules/core/m_kill.c
index dd4e71d52c12e15d3f453957cd03609929543c79..060310bc58ab5fbf9cd2a9dd62bcd8b051754ade 100644 (file)
--- a/modules/core/m_kill.c
+++ b/modules/core/m_kill.c
@@ -78,9 +78,9 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 
        user = parv[1];
 
-       if(!IsOperLocalKill(source_p))
+       if(!IsOperKill(source_p))
        {
-               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "local_kill");
+               sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "kill");
                return;
        }
 
@@ -114,14 +114,6 @@ mo_kill(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
                sendto_one_notice(source_p, ":KILL changed from %s to %s", user, target_p->name);
        }
 
-       if(!MyConnect(target_p) && (!IsOperGlobalKill(source_p)))
-       {
-               sendto_one_notice(source_p, ":Nick %s is not on your server "
-                                           "and you do not have the global_kill flag",
-                               target_p->name);
-               return;
-       }
-
        /* Last chance to stop the kill */
        moduledata.client = source_p;
        moduledata.target = target_p;