repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 805bf0349064a1a1f6412c19a3a3bcb7fb7ccbe1:
path_to: 
revision_to: 

commit 805bf0349064a1a1f6412c19a3a3bcb7fb7ccbe1
Author: Alexander Barton 
Date:   Fri Jul 17 16:16:04 2009 +0200

    Client_CheckID(): fix connection information

    This patch fixes the following silly log messages:
    'ID "XXX" already registered (on connection -1)!'

    If the ID is already registered on a local connection, the local
    connection ID is printed; and if the ID is connected via a remote
    server, "via network" is displayed.

diff --git a/src/ngircd/client.c b/src/ngircd/client.c

--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -758,18 +758,18 @@ Client_CheckID( CLIENT *Client, char *ID )
 	assert( Client->conn_id > NONE );
 	assert( ID != NULL );

-	/* Nick too long? */
+	/* ID too long? */
 	if (strlen(ID) > CLIENT_ID_LEN) {
 		IRC_WriteStrClient(Client, ERR_ERRONEUSNICKNAME_MSG, Client_ID(Client), ID);
 		return false;
 	}

-	/* does ID already exist? */
+	/* ID already in use? */
 	c = My_Clients;
 	while (c) {
 		if (strcasecmp(c->id, ID) == 0) {
 			snprintf(str, sizeof(str), "ID \"%s\" already registered", ID);
-			if (Client->conn_id != c->conn_id)
+			if (c->conn_id != NONE)
 				Log(LOG_ERR, "%s (on connection %d)!", str, c->conn_id);
 			else
 				Log(LOG_ERR, "%s (via network)!", str);

-----END OF PAGE-----