Commit Diff

Commit:
4e125fb67cf9d00a9da0bf4602a4e5c0745bf282
From:
Alexander Barton <alex@barton.de>
Date:
Message:
Allow IRC services to change their nick names.
Actions:
Patch | Tree
commit - 33f32dbd6707f15374ca626f036ab7ada9dbb112
commit + 4e125fb67cf9d00a9da0bf4602a4e5c0745bf282
blob - 3cf6ab91e39c0ccd28633a45509b79f4882433ab
blob + 95ec959cc0cf9bbf9d588e2776c4a51bbe59a442
--- src/ngircd/irc-login.c
+++ src/ngircd/irc-login.c
@@ -180,22 +180,17 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-#ifndef STRICT_RFC
 	/* Some IRC clients, for example BitchX, send the NICK and USER
 	 * commands in the wrong order ... */
-	if( Client_Type( Client ) == CLIENT_UNKNOWN
-	    || Client_Type( Client ) == CLIENT_GOTPASS
-	    || Client_Type( Client ) == CLIENT_GOTNICK
-	    || Client_Type( Client ) == CLIENT_GOTUSER
-	    || Client_Type( Client ) == CLIENT_USER
-	    || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
-#else
-	if( Client_Type( Client ) == CLIENT_UNKNOWN
-	    || Client_Type( Client ) == CLIENT_GOTPASS
-	    || Client_Type( Client ) == CLIENT_GOTNICK
-	    || Client_Type( Client ) == CLIENT_USER
-	    || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 ))
+	if(Client_Type(Client) == CLIENT_UNKNOWN
+	    || Client_Type(Client) == CLIENT_GOTPASS
+	    || Client_Type(Client) == CLIENT_GOTNICK
+#ifndef STRICT_RFC
+	    || Client_Type(Client) == CLIENT_GOTUSER
 #endif
+	    || Client_Type(Client) == CLIENT_USER
+	    || Client_Type(Client) == CLIENT_SERVICE
+	    || (Client_Type(Client) == CLIENT_SERVER && Req->argc == 1))
 	{
 		/* User registration or change of nickname */
 
@@ -243,9 +238,9 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 				return CONNECTED;
 		}
 
-		if(( Client_Type( target ) != CLIENT_USER )
-		   && ( Client_Type( target ) != CLIENT_SERVER ))
-		{
+		if (Client_Type(target) != CLIENT_USER &&
+		    Client_Type(target) != CLIENT_SERVICE &&
+		    Client_Type(target) != CLIENT_SERVER) {
 			/* New client */
 			Log( LOG_DEBUG, "Connection %d: got valid NICK command ...", 
 			     Client_Conn( Client ));
@@ -259,25 +254,22 @@ IRC_NICK( CLIENT *Client, REQUEST *Req )
 				return Hello_User( Client );
 			else
 				Client_SetType( Client, CLIENT_GOTNICK );
-		}
-		else
-		{
+		} else {
 			/* Nickname change */
 			if (Client_Conn(target) > NONE) {
 				/* Local client */
 				Log(LOG_INFO,
-				    "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".",
-				    Client_Mask(target), Client_Conn(target),
-				    Client_ID(target), Req->argv[0]);
-				Conn_UpdateIdle(Client_Conn(target));
-			}
-			else
-			{
+				    "%s \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".",
+				    Client_TypeText(target), Client_Mask(target),
+				    Client_Conn(target), Client_ID(target),
+				    Req->argv[0]);
+				Conn_UpdateIdle(Client_Conn(target));
+			} else {
 				/* Remote client */
-				Log( LOG_DEBUG,
-				     "User \"%s\" changed nick: \"%s\" -> \"%s\".",
-				     Client_Mask( target ), Client_ID( target ),
-				     Req->argv[0] );
+				LogDebug("%s \"%s\" changed nick: \"%s\" -> \"%s\".",
+					 Client_TypeText(target),
+					 Client_Mask(target), Client_ID(target),
+					 Req->argv[0]);
 			}
 
 			/* Inform all users and servers (which have to know)