- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : write_whoreply(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 32188d821b24198e4f6b5283fec1060b6700b66b URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=32188d82… Author: Alexander Barton <alex(a)barton.de> Date: Wed Aug 18 00:01:14 2010 +0200 write_whoreply(): respect hostname cloaking --- src/ngircd/irc-info.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 3da4c83..905799e 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -728,9 +728,11 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req ) static bool write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *flags) { - return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), channelname, - Client_User(c), Client_Hostname(c), Client_ID(Client_Introducer(c)), Client_ID(c), - flags, Client_Hops(c), Client_Info(c)); + return IRC_WriteStrClient(Client, RPL_WHOREPLY_MSG, Client_ID(Client), + channelname, Client_User(c), + Client_HostnameCloaked(c), + Client_ID(Client_Introducer(c)), Client_ID(c), + flags, Client_Hops(c), Client_Info(c)); } @@ -1329,7 +1331,6 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) } /* IRC_Send_NAMES */ - /** * Send the ISUPPORT numeric (005). * This numeric indicates the features that are supported by this server.

1 0

Alexander Barton : Implement user mode "x": hostname cloaking (closes: #102 )
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 2a4bf67aaceebd3567dcd0ac1db2b9027560f574 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=2a4bf67a… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:05:06 2010 +0200 Implement user mode "x": hostname cloaking (closes: #102) When a client has user mode "x" set, its real hostname is cloaked by substituting it with the server name (as configured in ngircd.conf). Restricted clients (user mode "r") aren't allowed to change mode "x". Please note that hostname cloaking is only in effect in server-client communication! The server still uses the real hostname for its own logging and for all server-server communication -- therefore all servers in the network must support user mode "x" to prevent older servers from leaking the real hostname of a cloaked client! --- src/ngircd/defines.h | 2 +- src/ngircd/irc-mode.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/ngircd/defines.h b/src/ngircd/defines.h index 579d552..01b6037 100644 --- a/src/ngircd/defines.h +++ b/src/ngircd/defines.h @@ -80,7 +80,7 @@ #define RECONNECT_DELAY 3 /* Time to delay re-connect attempts in seconds. */ -#define USERMODES "aciorsw" /* Supported user modes. */ +#define USERMODES "aciorswx" /* Supported user modes. */ #define CHANMODES "biIklmnoPstvz" /* Supported channel modes. */ #define CONNECTED true /* Internal status codes. */ diff --git a/src/ngircd/irc-mode.c b/src/ngircd/irc-mode.c index 45defeb..df464a7 100644 --- a/src/ngircd/irc-mode.c +++ b/src/ngircd/irc-mode.c @@ -185,6 +185,7 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) ERR_NOPRIVILEGES_MSG, Client_ID(Origin)); break; + case 'o': /* IRC operator (only unsettable!) */ if(( ! set ) || ( Client_Type( Client ) == CLIENT_SERVER )) { @@ -199,6 +200,15 @@ Client_Mode( CLIENT *Client, REQUEST *Req, CLIENT *Origin, CLIENT *Target ) else ok = IRC_WriteStrClient( Origin, ERR_RESTRICTED_MSG, Client_ID( Origin )); break; + case 'x': /* Cloak hostname */ + if (Client_HasMode(Client, 'r')) + IRC_WriteStrClient(Origin, + ERR_RESTRICTED_MSG, + Client_ID(Origin)); + else + x[0] = 'x'; + break; + default: Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Origin )); if( Client_Type( Client ) != CLIENT_SERVER ) ok = IRC_WriteStrClient( Origin, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Origin ), set ? '+' : '-', *mode_ptr );

1 0

Alexander Barton : Refactor IRC_WriteStr{Channel|Related}Prefix(); support cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: fd4dfccc30fdbb61120e3c51f4b987cc725b603d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fd4dfccc… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:11:37 2010 +0200 Refactor IRC_WriteStr{Channel|Related}Prefix(); support cloaking Move common code to new local function Send_Marked_Connections() and respect hostname cloaking. --- src/ngircd/irc-write.c | 55 ++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index dd592f0..fdc0488 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -39,6 +39,7 @@ static const char *Get_Prefix PARAMS((CLIENT *Target, CLIENT *Client)); static void cb_writeStrServersPrefixFlag PARAMS((CLIENT *Client, CLIENT *Prefix, void *Buffer)); +static bool Send_Marked_Connections PARAMS((CLIENT *Prefix, const char *Buffer)); #ifdef PROTOTYPES @@ -159,7 +160,6 @@ const char *Format; va_dcl #endif { - bool ok = CONNECTED; char buffer[1000]; CL2CHAN *cl2chan; CONN_ID conn; @@ -201,19 +201,7 @@ va_dcl } cl2chan = Channel_NextMember( Chan, cl2chan ); } - - conn = Conn_First( ); - while( conn != NONE ) - { - /* do we need to send data via this connection? */ - if( Conn_Flag( conn ) == SEND_TO_SERVER) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer ); - else if( Conn_Flag( conn ) == SEND_TO_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer ); - if( ! ok ) break; - - conn = Conn_Next( conn ); - } - - return ok; + return Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrChannelPrefix */ @@ -346,7 +334,6 @@ const char *Format; va_dcl #endif { - bool ok = CONNECTED; CL2CHAN *chan_cl2chan, *cl2chan; char buffer[1000]; CHANNEL *chan; @@ -394,18 +381,7 @@ va_dcl chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan ); } - - conn = Conn_First( ); - while( conn != NONE ) - { - /* send data via this connection? */ - if( Conn_Flag( conn ) == SEND_TO_SERVER ) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer ); - else if( Conn_Flag( conn ) == SEND_TO_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer ); - if( ! ok ) break; - - conn = Conn_Next( conn ); - } - return ok; + return Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrRelatedPrefix */ @@ -490,4 +466,29 @@ cb_writeStrServersPrefixFlag(CLIENT *Client, CLIENT *Prefix, void *Buffer) } /* cb_writeStrServersPrefixFlag */ +static bool +Send_Marked_Connections(CLIENT *Prefix, const char *Buffer) +{ + CONN_ID conn; + bool ok = CONNECTED; + + assert(Prefix != NULL); + assert(Buffer != NULL); + + conn = Conn_First(); + while (conn != NONE) { + if (Conn_Flag(conn) == SEND_TO_SERVER) + ok = Conn_WriteStr(conn, ":%s %s", + Client_ID(Prefix), Buffer); + else if (Conn_Flag(conn) == SEND_TO_USER) + ok = Conn_WriteStr(conn, ":%s %s", + Client_MaskCloaked(Prefix), Buffer); + if (!ok) + break; + conn = Conn_Next( conn ); + } + return ok; +} + + /* -eof- */

1 0

Alexander Barton : IRC_WriteStrClientPrefix() / Get_Prefix(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 31ea0f8ee963087728558e55298ff519c956d4f3 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=31ea0f8e… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:14:51 2010 +0200 IRC_WriteStrClientPrefix() / Get_Prefix(): respect hostname cloaking --- src/ngircd/irc-write.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index fdc0488..07aadf4 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -104,7 +104,8 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Get_Prefix( Client_NextHop( Client ), Prefix ), buffer ); + return Conn_WriteStr(Client_Conn(Client_NextHop(Client)), ":%s %s", + Get_Prefix(Client_NextHop(Client), Prefix), buffer); } /* IRC_WriteStrClientPrefix */ @@ -449,13 +450,15 @@ IRC_SetPenalty( CLIENT *Client, time_t Seconds ) static const char * -Get_Prefix( CLIENT *Target, CLIENT *Client ) +Get_Prefix(CLIENT *Target, CLIENT *Client) { - assert( Target != NULL ); - assert( Client != NULL ); + assert (Target != NULL); + assert (Client != NULL); - if( Client_Type( Target ) == CLIENT_SERVER ) return Client_ID( Client ); - else return Client_Mask( Client ); + if (Client_Type(Target) == CLIENT_SERVER) + return Client_ID(Client); + else + return Client_MaskCloaked(Client); } /* Get_Prefix */

1 0

Alexander Barton : Send_Message(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 0263fa4c6623478d0ff6680b65bfcadd25f5f6df URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=0263fa4c… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:15:58 2010 +0200 Send_Message(): respect hostname cloaking --- src/ngircd/irc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index a1d073c..75af321 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -412,7 +412,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) if (nick != NULL && host != NULL) { if (strcmp(nick, Client_ID(cl)) == 0 && strcmp(user, Client_User(cl)) == 0 && - strcasecmp(host, Client_Hostname(cl)) == 0) + strcasecmp(host, Client_HostnameCloaked(cl)) == 0) break; else continue; @@ -420,7 +420,7 @@ Send_Message(CLIENT * Client, REQUEST * Req, int ForceType, bool SendErrors) if (strcasecmp(user, Client_User(cl)) != 0) continue; if (host != NULL && strcasecmp(host, - Client_Hostname(cl)) != 0) + Client_HostnameCloaked(cl)) != 0) continue; if (server != NULL && strcasecmp(server, Client_ID(Client_Introducer(cl))) != 0)

1 0

Alexander Barton : IRC_USERHOST(): respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 6f4a348b753d8a4ddb5a2dc40578807d4722e0c6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6f4a348b… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 23:56:36 2010 +0200 IRC_USERHOST(): respect hostname cloaking --- src/ngircd/irc-info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index d0dca7f..3da4c83 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -665,7 +665,7 @@ IRC_USERHOST(CLIENT *Client, REQUEST *Req) strlcat(rpl, "+", sizeof(rpl)); strlcat(rpl, Client_User(c), sizeof(rpl)); strlcat(rpl, "@", sizeof(rpl)); - strlcat(rpl, Client_Hostname(c), sizeof(rpl)); + strlcat(rpl, Client_HostnameCloaked(c), sizeof(rpl)); strlcat(rpl, " ", sizeof(rpl)); } }

1 0

Alexander Barton : IRC_USERHOST(): Code cleanup & some documentation
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: a51670005fde772c2b967bfb6a1166a05c1f5c33 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a5167000… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 23:55:40 2010 +0200 IRC_USERHOST(): Code cleanup & some documentation --- src/ngircd/irc-info.c | 55 ++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index 74530f7..d0dca7f 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -627,42 +627,51 @@ IRC_TIME( CLIENT *Client, REQUEST *Req ) } /* IRC_TIME */ +/** + * Handler for the IRC command "USERHOST". + * See RFC 2812 section 4.8. + */ GLOBAL bool -IRC_USERHOST( CLIENT *Client, REQUEST *Req ) +IRC_USERHOST(CLIENT *Client, REQUEST *Req) { char rpl[COMMAND_LEN]; CLIENT *c; int max, i; - assert( Client != NULL ); - assert( Req != NULL ); + assert(Client != NULL); + assert(Req != NULL); - if(( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if ((Req->argc < 1)) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); - if( Req->argc > 5 ) max = 5; - else max = Req->argc; + if (Req->argc > 5) + max = 5; + else + max = Req->argc; - strlcpy( rpl, RPL_USERHOST_MSG, sizeof rpl ); - for( i = 0; i < max; i++ ) - { - c = Client_Search( Req->argv[i] ); - if( c && ( Client_Type( c ) == CLIENT_USER )) - { + strlcpy(rpl, RPL_USERHOST_MSG, sizeof rpl); + for (i = 0; i < max; i++) { + c = Client_Search(Req->argv[i]); + if (c && (Client_Type(c) == CLIENT_USER)) { /* This Nick is "online" */ - strlcat( rpl, Client_ID( c ), sizeof( rpl )); - if( Client_HasMode( c, 'o' )) strlcat( rpl, "*", sizeof( rpl )); - strlcat( rpl, "=", sizeof( rpl )); - if( Client_HasMode( c, 'a' )) strlcat( rpl, "-", sizeof( rpl )); - else strlcat( rpl, "+", sizeof( rpl )); - strlcat( rpl, Client_User( c ), sizeof( rpl )); - strlcat( rpl, "@", sizeof( rpl )); - strlcat( rpl, Client_Hostname( c ), sizeof( rpl )); - strlcat( rpl, " ", sizeof( rpl )); + strlcat(rpl, Client_ID(c), sizeof(rpl)); + if (Client_HasMode(c, 'o')) + strlcat(rpl, "*", sizeof(rpl)); + strlcat(rpl, "=", sizeof(rpl)); + if (Client_HasMode(c, 'a')) + strlcat(rpl, "-", sizeof(rpl)); + else + strlcat(rpl, "+", sizeof(rpl)); + strlcat(rpl, Client_User(c), sizeof(rpl)); + strlcat(rpl, "@", sizeof(rpl)); + strlcat(rpl, Client_Hostname(c), sizeof(rpl)); + strlcat(rpl, " ", sizeof(rpl)); } } - ngt_TrimLastChr( rpl, ' '); + ngt_TrimLastChr(rpl, ' '); - return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) ); + return IRC_WriteStrClient(Client, rpl, Client_ID(Client)); } /* IRC_USERHOST */

1 0

Alexander Barton : Clean up an document Client_Hostname() and Client_Mask()
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 617640e0a358dc29c5e4f82eb6b828030ef21670 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=617640e0… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 20:51:14 2010 +0200 Clean up an document Client_Hostname() and Client_Mask() --- src/ngircd/client.c | 30 +++++++++++++++++++++--------- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 96d40d2..a067ef7 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -647,10 +647,15 @@ Client_OrigUser(CLIENT *Client) { #endif +/** + * Return the hostname of a client. + * @param Client Pointer to client structure + * @return Pointer to client hostname + */ GLOBAL char * -Client_Hostname( CLIENT *Client ) +Client_Hostname(CLIENT *Client) { - assert( Client != NULL ); + assert (Client != NULL); return Client->host; } /* Client_Hostname */ @@ -727,20 +732,27 @@ Client_NextHop( CLIENT *Client ) /** - * return Client-ID ("client!user@host"), this ID is needed for e.g. - * prefixes. Returnes pointer to static buffer. + * Return ID of a client: "client!user@host" + * This client ID is used for IRC prefixes, for example. + * Please note that this function uses a global static buffer, so you can't + * nest invocations without overwriting erlier results! + * @param Client Pointer to client structure + * @return Pointer to global buffer containing the client ID */ GLOBAL char * Client_Mask( CLIENT *Client ) { - static char GetID_Buffer[GETID_LEN]; + static char Mask_Buffer[GETID_LEN]; - assert( Client != NULL ); + assert (Client != NULL); - if( Client->type == CLIENT_SERVER ) return Client->id; + /* Servers: return name only, there is no "mask" */ + if (Client->type == CLIENT_SERVER) + return Client->id; - snprintf(GetID_Buffer, GETID_LEN, "%s!%s@%s", Client->id, Client->user, Client->host); - return GetID_Buffer; + snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", + Client->id, Client->user, Client->host); + return Mask_Buffer; } /* Client_Mask */

1 0

Alexander Barton : Implement Client_HostnameCloaked() and Client_MaskCloaked()
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 6fdd3479f126a866c022c39dcd424d6042de6875 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6fdd3479… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 20:54:33 2010 +0200 Implement Client_HostnameCloaked() and Client_MaskCloaked() These two functions return the cloaked hostname, if the client has enabled hostname cloaking indicated by the -- still to implement -- user mode "x". See furter patches :-) --- src/ngircd/client.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/ngircd/client.h | 2 ++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/src/ngircd/client.c b/src/ngircd/client.c index a067ef7..dd4113e 100644 --- a/src/ngircd/client.c +++ b/src/ngircd/client.c @@ -660,6 +660,23 @@ Client_Hostname(CLIENT *Client) } /* Client_Hostname */ +/** + * Get potentially cloaked hostname of a client. + * If the client has not enabled cloaking, the real hostname is used. + * @param Client Pointer to client structure + * @return Pointer to client hostname + */ +GLOBAL char * +Client_HostnameCloaked(CLIENT *Client) +{ + assert(Client != NULL); + if (Client_HasMode(Client, 'x')) + return Client_ID(Client->introducer); + else + return Client_Hostname(Client); +} /* Client_HostnameCloaked */ + + GLOBAL char * Client_Password( CLIENT *Client ) { @@ -756,6 +773,32 @@ Client_Mask( CLIENT *Client ) } /* Client_Mask */ +/** + * Return ID of a client with cloaked hostname: "client!user@server-name" + * This client ID is used for IRC prefixes, for example. + * Please note that this function uses a global static buffer, so you can't + * nest invocations without overwriting erlier results! + * If the client has not enabled cloaking, the real hostname is used. + * @param Client Pointer to client structure + * @return Pointer to global buffer containing the client ID + */ +GLOBAL char * +Client_MaskCloaked(CLIENT *Client) +{ + static char Mask_Buffer[GETID_LEN]; + + assert (Client != NULL); + + /* Is the client using cloaking at all? */ + if (!Client_HasMode(Client, 'x')) + return Client_Mask(Client); + + snprintf(Mask_Buffer, GETID_LEN, "%s!%s@%s", + Client->id, Client->user, Client_ID(Client->introducer)); + return Mask_Buffer; +} /* Client_MaskCloaked */ + + GLOBAL CLIENT * Client_Introducer( CLIENT *Client ) { diff --git a/src/ngircd/client.h b/src/ngircd/client.h index bd000a5..98a0d1a 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -93,12 +93,14 @@ GLOBAL int Client_Type PARAMS(( CLIENT *Client )); GLOBAL CONN_ID Client_Conn PARAMS(( CLIENT *Client )); GLOBAL char *Client_ID PARAMS(( CLIENT *Client )); GLOBAL char *Client_Mask PARAMS(( CLIENT *Client )); +GLOBAL char *Client_MaskCloaked PARAMS(( CLIENT *Client )); GLOBAL char *Client_Info PARAMS(( CLIENT *Client )); GLOBAL char *Client_User PARAMS(( CLIENT *Client )); #ifdef PAM GLOBAL char *Client_OrigUser PARAMS(( CLIENT *Client )); #endif GLOBAL char *Client_Hostname PARAMS(( CLIENT *Client )); +GLOBAL char *Client_HostnameCloaked PARAMS(( CLIENT *Client )); GLOBAL char *Client_Password PARAMS(( CLIENT *Client )); GLOBAL char *Client_Modes PARAMS(( CLIENT *Client )); GLOBAL char *Client_Flags PARAMS(( CLIENT *Client ));

1 0

Alexander Barton : WHOIS: respect hostname cloaking
by alex＠arthur.barton.de 19 Aug '10

19 Aug '10

Module: ngircd.git Branch: master Commit: 3fd4f320b726e91f674c424e0c5ff5abce2c6f09 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=3fd4f320… Author: Alexander Barton <alex(a)barton.de> Date: Tue Aug 17 21:00:02 2010 +0200 WHOIS: respect hostname cloaking --- src/ngircd/irc-info.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ngircd/irc-info.c b/src/ngircd/irc-info.c index ad585fe..74530f7 100644 --- a/src/ngircd/irc-info.c +++ b/src/ngircd/irc-info.c @@ -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] ); - /* 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;

1 0