KICK user only if he's really in the channel!

diff --git a/src/mod-watchdog.c b/src/mod-watchdog.c
index e62bcd003156df78c685472dabfcb3eadaeb59c8..65935bd8105bd1619835171b366d2014681516b1 100644 (file)
--- a/src/mod-watchdog.c
+++ b/src/mod-watchdog.c
@@ -360,7 +360,8 @@ watchdog_detected_badword(struct userNode *user, struct chanNode *chan, struct b
             free(hostmask);
             
         case BADACTION_KICK:
-            KickChannelUser(user, chan, watchdog, reason);     
+            if(GetUserMode(chan, user))
+                KickChannelUser(user, chan, watchdog, reason); 
             break;
         case BADACTION_KILL:
             DelUser(user, watchdog, 1, reason);

diff --git a/src/proto-p10.c b/src/proto-p10.c
index f807401d86a96c9d463146f391f8adc18c864d6c..1e4702726fd9fcfe080c4f9a21beb34588056f24 100644 (file)
--- a/src/proto-p10.c
+++ b/src/proto-p10.c
@@ -1777,11 +1777,10 @@ static CMD_FUNC(cmd_relay)
              } else {
                 devnull[0] = 0;
              }
-             /* // currently disabled because of a ircu incompatibility
+             /*
              if(!HANDLE_FLAGGED(hi, AUTOHIDE)) {
                 sprintf(tmp,"%s LA %s 0 %s\n",argv[3],hi->handle,devnull);
-             } else 
-             */
+             } else */ 
              if(getfakehost(argv[4])) {
                 sprintf(tmp,"%s LA %s %s %s\n",argv[3],hi->handle,getfakehost(argv[4]),devnull);
              } else {