localoperkill: dont sent local kill by local irc operator upstream

diff --git a/localoperkill.patch b/localoperkill.patch
new file mode 100644 (file)
index 0000000..91dab63
--- /dev/null
+++ b/localoperkill.patch
@@ -0,0 +1,26 @@
+dont sent local kills by local irc operator upstream
+
+diff -r 50cf6951b339 ircd/m_kill.c
+--- a/ircd/m_kill.c    Thu Mar 18 13:27:05 2010 +0100
++++ b/ircd/m_kill.c    Thu Mar 18 13:39:16 2010 +0100
+@@ -143,7 +143,9 @@
+    *  - wiebe            
+    */
+    /* if (IsServer(cptr) || !MyConnect(victim)) { */
+-  sendcmdto_serv_butone(sptr, CMD_KILL, cptr, "%C :%s!%s %s", victim,
++  /* dont sent kills by local opers upstream though */
++  if (!MyUser(sptr) || !IsLocOp(sptr) || !MyUser(victim)) {
++     sendcmdto_serv_butone(sptr, CMD_KILL, cptr, "%C :%s!%s %s", victim,
+                           inpath, path, msg);
+ 
+    /*
+@@ -151,7 +153,8 @@
+     * the unnecessary QUIT for this. (This flag should never be
+     * set in any other place)
+     */
+-  SetFlag(victim, FLAG_KILLED);
++    SetFlag(victim, FLAG_KILLED);
++  }
+ 
+   /*
+    * Tell the victim she/he has been zapped, but *only* if

diff --git a/series b/series
index 077482251030ad36d91331b6ad836f21c0a26505..05d71aa8d66317ee9f51323e822f8bde2df48f23 100644 (file)
--- a/series
+++ b/series
@@ -5,6 +5,7 @@ nserverflag.patch
 minoplevel.patch
 ischannelservice.patch
 invalidatebanssethost.patch
+localoperkill.patch
 commonchansumode.patch
 who-accountid.patch
 hiskgline.patch