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

Author: Alexander Barton alex@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 */