Commit Diff

Commit:
9f122037aecc327e689a2681c25540688621c630
From:
Alexander Barton <alex@barton.de>
Date:
Message:
- Logging von doppelten ID's verbessert.
Actions:
Patch | Tree
commit - cde9dfdb77066bb391ff397273079bf309e71ed3
commit + 9f122037aecc327e689a2681c25540688621c630
blob - 46736cc01be35eff1f307c563b380d70eff76133
blob + 1aaabf609e2ebf9e9958078f489901cc0b0e890f
--- src/ngircd/client.c
+++ src/ngircd/client.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: client.c,v 1.63 2002/11/26 08:36:34 alex Exp $
+ * $Id: client.c,v 1.64 2002/12/03 18:57:44 alex Exp $
  *
  * client.c: Management aller Clients
  *
@@ -808,8 +808,9 @@ Client_CheckID( CLIENT *Client, CHAR *ID )
 		if( strcasecmp( c->id, ID ) == 0 )
 		{
 			/* die Server-ID gibt es bereits */
-			sprintf( str, "ID \"%s\" already registered!", ID );
-			Log( LOG_ERR, "%s (on connection %d)", str, Client->conn_id );
+			sprintf( str, "ID \"%s\" already registered", ID );
+			if( Client->conn_id != c->conn_id ) Log( LOG_ERR, "%s (on connection %d)!", str, c->conn_id );
+			else Log( LOG_ERR, "%s (via network)!", str );
 			Conn_Close( Client->conn_id, str, str, TRUE );
 			return FALSE;
 		}
blob - e9427e46b0b22c6e233c34b2f0e282ca6006bc8f
blob + 02251658ee59a656188e4b2779d71221ecec3748
--- src/ngircd/irc-login.c
+++ src/ngircd/irc-login.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-login.c,v 1.25 2002/11/30 17:39:56 alex Exp $
+ * $Id: irc-login.c,v 1.26 2002/12/03 18:56:33 alex Exp $
  *
  * irc-login.c: Anmeldung und Abmeldung im IRC
  */
@@ -115,7 +115,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 				flags++;
 			}
 			else flags = "";
-			Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", Client_Conn( Client ), impl, serverver, protohigh, protolow, flags );
+			Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags );
 		}
 		else
 		{
@@ -124,7 +124,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 			serverver = "";
 			if( strchr( ircflags, 'Z' )) flags = "Z";
 			else flags = "";
-			Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", Client_Conn( Client ), impl, protohigh, protolow, flags );
+			Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags );
 		}
 
 		Client_SetType( Client, CLIENT_GOTPASSSERVER );