]> arthur.barton.de Git - ngircd-alex.git/commitdiff
WHOIS: respect hostname cloaking
authorAlexander Barton <alex@barton.de>
Tue, 17 Aug 2010 19:00:02 +0000 (21:00 +0200)
committerAlexander Barton <alex@barton.de>
Tue, 17 Aug 2010 19:00:47 +0000 (21:00 +0200)
src/ngircd/irc-info.c

index ad585fe236151dc68f013ad22a81896512de767a..74530f7b54a3e90d2e246e1b21f0542341edd08f 100644 (file)
@@ -939,8 +939,11 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 
        if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], Req->argv[1] );
 
 
        if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], Req->argv[1] );
 
-       /* Nick, user and name */
-       if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED;
+       /* Nick, user, hostname and client info */
+       if (!IRC_WriteStrClient(from, RPL_WHOISUSER_MSG, Client_ID(from),
+                               Client_ID(c), Client_User(c),
+                               Client_HostnameCloaked(c), Client_Info(c)))
+               return DISCONNECTED;
 
        /* Server */
        if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED;
 
        /* Server */
        if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED;