commit 1443bc381c3ce8de0652b9dcf663272bd1923ff3
from: Alexander Barton <alex@barton.de>
date: Wed Jan 08 22:27:13 2003 UTC

- Enhanced IRC_KILL to get along with Client==Client_ThisServer() for "fake KILLs".

commit - 9d82635b15acdf26784829674b97d454b741f447
commit + 1443bc381c3ce8de0652b9dcf663272bd1923ff3
blob - 4da7abd6fdf96552d612d68b30bbf49b3f09ae80
blob + f6eda971f997a818e0621563061203ddee836a75
--- src/ngircd/irc.c
+++ src/ngircd/irc.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc.c,v 1.115 2003/01/08 22:07:34 alex Exp $";
+static char UNUSED id[] = "$Id: irc.c,v 1.116 2003/01/08 22:27:13 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -71,7 +71,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 		prefix = Client_ThisServer( );
 	}
 
-	Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
+	if( Client != Client_ThisServer( )) Log( LOG_NOTICE|LOG_snotice, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] );
 
 	/* Build reason string */
 	if( Client_Type( Client ) == CLIENT_USER ) snprintf( reason, sizeof( reason ), "KILLed by %s: %s", Client_ID( Client ), Req->argv[1] );
@@ -101,7 +101,7 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 	else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
 
 	/* Are we still connected or were we killed, too? */
-	if( Client_GetFromConn( my_conn )) return CONNECTED;
+	if(( my_conn > NONE ) && ( Client_GetFromConn( my_conn ))) return CONNECTED;
 	else return DISCONNECTED;
 } /* IRC_KILL */