Module: ngircd.git Branch: master Commit: b545d38ae4458257be4de9031d4d3501690ced9c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=b545d...

Author: Florian Westphal fw@strlen.de Date: Wed Apr 22 23:15:17 2009 +0200

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.

---

src/ngircd/irc-server.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 11ff54f..7236d9a 100644 --- a/src/ngircd/irc-server.c +++ b/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; @@ -168,10 +168,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);