From: Alexander Barton <alex@barton.de>
Date: Tue, 17 Aug 2010 19:14:51 +0000 (+0200)
Subject: IRC_WriteStrClientPrefix() / Get_Prefix(): respect hostname cloaking
X-Git-Tag: rel-17-rc1~38
X-Git-Url: https://arthur.barton.de/gitweb/?p=ngircd-alex.git;a=commitdiff_plain;h=31ea0f8ee963087728558e55298ff519c956d4f3

IRC_WriteStrClientPrefix() / Get_Prefix(): respect hostname cloaking
---

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index fdc0488b..07aadf48 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 */