From bb94d18115c564c9ee4c3518f808649878cbfb67 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Wed, 8 Jan 2003 17:45:15 +0000
Subject: [PATCH] - fixed up propagation of modes with arguments between
 servers.

---
 src/ngircd/irc-channel.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c
index e5b912b4..b5fc0768 100644
--- a/src/ngircd/irc-channel.c
+++ b/src/ngircd/irc-channel.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.23 2003/01/01 13:29:40 alex Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.24 2003/01/08 17:45:15 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -386,9 +386,13 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req )
 		ptr = Channel_Modes( chan );
 		if( ! *ptr )
 		{
-			/* OK, es sind noch keine Modes gesetzt */
+			/* OK, this channel doesn't have modes jet, set the received ones: */
 			Channel_SetModes( chan, &Req->argv[1][1] );
 			IRC_WriteStrChannelPrefix( Client, chan, from, FALSE, "MODE %s +%s", Req->argv[0], &Req->argv[1][1] );
+
+			/* Delete modes which we never want to inherit */
+			Channel_ModeDel( chan, 'l' );
+			Channel_ModeDel( chan, 'k' );
 		}
 	}
 	else Log( LOG_WARNING, "CHANNELINFO: invalid MODE format ignored!" );