Merge branch 'newconfig'

[ngircd-alex.git] / src / ngircd / client.c

diff --git a/src/ngircd/client.c b/src/ngircd/client.c
index 11decc8689584e116b6505a3369f20cbcd59f073..e01c424091dc274b559cedd95d87f6275e895ead 100644 (file)
--- a/src/ngircd/client.c
+++ b/src/ngircd/client.c
@@ -319,8 +319,8 @@ Client_SetHostname( CLIENT *Client, const char *Hostname )
        assert( Client != NULL );
        assert( Hostname != NULL );
 
-       if (strlen(Conf_ClientHost)) {
-               strlcpy( Client->host, Conf_ClientHost, sizeof( Client->host ));
+       if (strlen(Conf_CloakHost)) {
+               strlcpy( Client->host, Conf_CloakHost, sizeof( Client->host ));
        } else {
                strlcpy( Client->host, Hostname, sizeof( Client->host ));
        }
@@ -335,6 +335,9 @@ Client_SetID( CLIENT *Client, const char *ID )
        
        strlcpy( Client->id, ID, sizeof( Client->id ));
 
+       if (Conf_CloakUserToNick)
+               strlcpy( Client->user, ID, sizeof( Client->user ));
+
        /* Hash */
        Client->hash = Hash( Client->id );
 } /* Client_SetID */
@@ -348,6 +351,8 @@ Client_SetUser( CLIENT *Client, const char *User, bool Idented )
        assert( Client != NULL );
        assert( User != NULL );
 
+       if (Conf_CloakUserToNick) return;
+
        if (Idented) {
                strlcpy(Client->user, User, sizeof(Client->user));
        } else {