albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ClientUserNick setting

This commit is contained in:
Gabor Adam Toth 2010-12-20 03:35:17 +01:00 committed by Alexander Barton
parent 52f59149ad
commit 71d8c37171
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/sample-ngircd.conf.tmpl
View File

@ -27,6 +27,9 @@
# Set this hostname for every client instead of the real one # Set this hostname for every client instead of the real one
;ClientHost = irc.the.net ;ClientHost = irc.the.net
# Set every clients' user name to their nick name
;ClientUserNick = yes
# Info text of the server. This will be shown by WHOIS and # Info text of the server. This will be shown by WHOIS and
# LINKS requests for example. # LINKS requests for example.
Info = Server Info Text Info = Server Info Text

5
src/ngircd/client.c
View File

@ -335,6 +335,9 @@ Client_SetID( CLIENT *Client, const char *ID )
strlcpy( Client->id, ID, sizeof( Client->id )); strlcpy( Client->id, ID, sizeof( Client->id ));
if (Conf_ClientUserNick)
strlcpy( Client->user, ID, sizeof( Client->user ));
/* Hash */ /* Hash */
Client->hash = Hash( Client->id ); Client->hash = Hash( Client->id );
} /* Client_SetID */ } /* Client_SetID */
@ -348,6 +351,8 @@ Client_SetUser( CLIENT *Client, const char *User, bool Idented )
assert( Client != NULL ); assert( Client != NULL );
assert( User != NULL ); assert( User != NULL );
if (Conf_ClientUserNick) return;
if (Idented) { if (Idented) {
strlcpy(Client->user, User, sizeof(Client->user)); strlcpy(Client->user, User, sizeof(Client->user));
} else { } else {

7
src/ngircd/conf.c
View File

@ -296,6 +296,7 @@ Conf_Test( void )
puts( "[GLOBAL]" ); puts( "[GLOBAL]" );
printf(" Name = %s\n", Conf_ServerName); printf(" Name = %s\n", Conf_ServerName);
printf(" ClientHost = %s\n", Conf_ClientHost); printf(" ClientHost = %s\n", Conf_ClientHost);
printf(" ClientUserNick = %s\n", yesno_to_str(Conf_ClientUserNick));
printf(" Info = %s\n", Conf_ServerInfo); printf(" Info = %s\n", Conf_ServerInfo);
#ifndef PAM #ifndef PAM
printf(" Password = %s\n", Conf_ServerPwd); printf(" Password = %s\n", Conf_ServerPwd);
@ -592,6 +593,7 @@ Set_Defaults(bool InitServers)
strcpy(Conf_ServerName, ""); strcpy(Conf_ServerName, "");
strcpy(Conf_ClientHost, ""); strcpy(Conf_ClientHost, "");
Conf_ClientUserNick = false;
snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s",
PACKAGE_NAME, PACKAGE_VERSION); PACKAGE_NAME, PACKAGE_VERSION);
strcpy(Conf_ServerPwd, ""); strcpy(Conf_ServerPwd, "");
@ -979,6 +981,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
Config_Error_TooLong( Line, Var ); Config_Error_TooLong( Line, Var );
return; return;
} }
if( strcasecmp( Var, "ClientUserNick" ) == 0 ) {
/* Use client nick name as user name */
Conf_ClientUserNick = Check_ArgIsTrue( Arg );
return;
}
if( strcasecmp( Var, "Info" ) == 0 ) { if( strcasecmp( Var, "Info" ) == 0 ) {
/* Info text of server */ /* Info text of server */
len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo )); len = strlcpy( Conf_ServerInfo, Arg, sizeof( Conf_ServerInfo ));

1
src/ngircd/conf.h
View File

@ -99,6 +99,7 @@ GLOBAL char Conf_ServerName[CLIENT_ID_LEN];
/** Hostname of the clients */ /** Hostname of the clients */
GLOBAL char Conf_ClientHost[CLIENT_ID_LEN]; GLOBAL char Conf_ClientHost[CLIENT_ID_LEN];
GLOBAL bool Conf_ClientUserNick;
/** Server info text */ /** Server info text */
GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN]; GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN];