Commit Diff

Commit:
60a4085c3864b9faf43ee3716b2a08980443767e
From:
Alexander Barton <alex@barton.de>
Date:
Message:
- fixed up propagation of modes with arguments between servers.
Actions:
Patch | Tree
commit - 5206ab302d27f6375c3573b30a679e9d634c2a7e
commit + 60a4085c3864b9faf43ee3716b2a08980443767e
blob - e5b797f8c86c38c6168a5f241843b5c91b73dd64
blob + 58ee4648f9096389bf2fc21ffe02f2fa4786892d
--- src/ngircd/irc-channel.c
+++ src/ngircd/irc-channel.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-channel.c,v 1.21.2.1 2003/01/01 13:46:37 alex Exp $";
+static char UNUSED id[] = "$Id: irc-channel.c,v 1.21.2.2 2003/01/08 17:47:48 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!" );