Commit Diff

Commit:
b545d38ae4458257be4de9031d4d3501690ced9c
From:
Florian Westphal <fw@strlen.de>
Date:
Message:
irc-server: do not remove hostnames from info text that code does not really make sense -- the info text is freely cofngiureable and des not follow a specific format. Also, that "+2" might have caused invalid memory accesses.
Actions:
Patch | Tree
commit - 84eaed6c9afa92dcfd45181d5796cd7efd7e8b98
commit + b545d38ae4458257be4de9031d4d3501690ced9c
blob - 11ff54f869cf127f6847d62bf7aed1f359f7f5c3
blob + 7236d9a9e98082da63b2310e2f773ec4e0494e7f
--- src/ngircd/irc-server.c
+++ src/ngircd/irc-server.c
@@ -49,7 +49,7 @@
 GLOBAL bool
 IRC_SERVER( CLIENT *Client, REQUEST *Req )
 {
-	char str[LINE_LEN], *ptr;
+	char str[LINE_LEN];
 	CLIENT *from, *c;
 	bool ok;
 	int i;
@@ -167,10 +167,6 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 
 		/* check for existing server with same ID */
 		if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED;
-
-		/* remove superfluous hostnames from Info-Text */
-		ptr = strchr( Req->argv[3] + 2, '[' );
-		if( ! ptr ) ptr = Req->argv[3];
 
 		from = Client_Search( Req->prefix );
 		if( ! from )
@@ -181,7 +177,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
 			return DISCONNECTED;
 		}
 
-		c = Client_NewRemoteServer( Client, Req->argv[0], from, atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr, true);
+		c = Client_NewRemoteServer(Client, Req->argv[0], from, atoi(Req->argv[1]), atoi(Req->argv[2]), Req->argv[3], true);
 		if (!c) {
 			Log( LOG_ALERT, "Can't create client structure for server! (on connection %d)", Client_Conn( Client ));
 			Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", true);