- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Xcode: don't list sample-ngircd.conf, use sample-ngircd. conf.tmpl
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: 5b2512c2156443dbadec4ad66457d43dee87291e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=5b2512c2… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 27 20:41:48 2011 +0200 Xcode: don't list sample-ngircd.conf, use sample-ngircd.conf.tmpl --- contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj index 594a899..2f9124e 100644 --- a/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj +++ b/contrib/MacOSX/ngIRCd.xcodeproj/project.pbxproj @@ -181,7 +181,6 @@ FA322D9E0CEF752C001761B3 /* README-AUX.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "README-AUX.txt"; sourceTree = "<group>"; }; FA322D9F0CEF752C001761B3 /* README-BeOS.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "README-BeOS.txt"; sourceTree = "<group>"; }; FA322DA00CEF752C001761B3 /* RFC.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = RFC.txt; sourceTree = "<group>"; }; - FA322DA10CEF752C001761B3 /* sample-ngircd.conf */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "sample-ngircd.conf"; sourceTree = "<group>"; }; FA322DA40CEF752C001761B3 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = Doxyfile; sourceTree = "<group>"; }; FA322DA50CEF752C001761B3 /* footer.inc.html */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.html; path = footer.inc.html; sourceTree = "<group>"; }; FA322DA60CEF752C001761B3 /* header.inc.html */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text.html; path = header.inc.html; sourceTree = "<group>"; }; @@ -197,6 +196,7 @@ FA407F2C0DB159F400271AF1 /* ng_ipaddr.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; name = ng_ipaddr.c; path = ipaddr/ng_ipaddr.c; sourceTree = "<group>"; }; FA407F2D0DB159F400271AF1 /* ng_ipaddr.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = ng_ipaddr.h; path = ipaddr/ng_ipaddr.h; sourceTree = "<group>"; }; FA407F380DB15AC700271AF1 /* GIT.txt */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = GIT.txt; sourceTree = "<group>"; }; + FA77849A133FB9FF00740057 /* sample-ngircd.conf.tmpl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "sample-ngircd.conf.tmpl"; sourceTree = "<group>"; }; FA85178A0FA061EC006A1F5A /* op.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = op.h; sourceTree = "<group>"; }; FA85178B0FA061EC006A1F5A /* op.c */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.c; path = op.c; sourceTree = "<group>"; }; FA99428A10E82A27007F27ED /* proc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = proc.h; sourceTree = "<group>"; }; @@ -561,7 +561,7 @@ FA322D9E0CEF752C001761B3 /* README-AUX.txt */, FA322D9F0CEF752C001761B3 /* README-BeOS.txt */, FA322DA00CEF752C001761B3 /* RFC.txt */, - FA322DA10CEF752C001761B3 /* sample-ngircd.conf */, + FA77849A133FB9FF00740057 /* sample-ngircd.conf.tmpl */, FA322DA20CEF752C001761B3 /* src */, FA322DA90CEF752C001761B3 /* SSL.txt */, );

1 0

Alexander Barton : Warn when unknown variables are found in [Features] section
by alex＠arthur.barton.de 25 Mär '11

25 Mär '11

Module: ngircd.git Branch: master Commit: f1a4a4dc882e28affb0f2f3b940e5762df230ccd URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f1a4a4dc… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 25 12:12:20 2011 +0100 Warn when unknown variables are found in [Features] section --- src/ngircd/conf.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index d27a2dd..32461f3 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1278,6 +1278,10 @@ Handle_FEATURES(int Line, char *Var, char *Arg) WarnPAM(Line); return; } + + Config_Error(LOG_ERR, + "%s, line %d (section \"Features\"): Unknown variable \"%s\"!", + NGIRCd_ConfFile, Line, Var); } static void

1 0

Alexander Barton : Update doc/GIT.txt
by alex＠arthur.barton.de 25 Mär '11

25 Mär '11

Module: ngircd.git Branch: master Commit: 6cb90f399d21f0bdbf3744423c923402f3419b99 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=6cb90f39… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 25 11:14:04 2011 +0100 Update doc/GIT.txt --- doc/GIT.txt | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/GIT.txt b/doc/GIT.txt index c42696d..4375184 100644 --- a/doc/GIT.txt +++ b/doc/GIT.txt @@ -1,10 +1,18 @@ + ngIRCd - Next Generation IRC Server + http://ngircd.barton.de/ + + (c)2001-2011 Alexander Barton and Contributors. + ngIRCd is free software and published under the + terms of the GNU General Public License. -- GIT.txt -- + The source code of ngIRCd is maintained using git, the stupid content tracker. + I. Getting the source code ~~~~~~~~~~~~~~~~~~~~~~~~~~ To access the source tree anonymously, run: @@ -20,7 +28,8 @@ git commands will be executed from within this directory in the future. Please note: When checking out a fresh copy of ngIRCd using git, the configure script doesn't exist; you have to run the autogen.sh shell script (which is included in the source tree) to generate it. This requires you to -have GNU automake and GNU autoconf installed on your system. +have GNU automake and GNU autoconf installed on your system. Please see the +file INSTALL for details! To update the git tree: @@ -28,6 +37,7 @@ To update the git tree: This retrieves all changes and merges them into the current branch. + II. Contributing ~~~~~~~~~~~~~~~~ @@ -42,4 +52,3 @@ III. Write Access ~~~~~~~~~~~~~~~~~ If you want to contribute a couple of patches and write access to the git repository would be handy, please contact Alex Barton, <alex(a)barton.de>. -

1 0

Alexander Barton : Update INSTALL text
by alex＠arthur.barton.de 23 Mär '11

23 Mär '11

Module: ngircd.git Branch: master Commit: d587926eb091929faa4f57c8e79d181ce7946357 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d587926e… Author: Alexander Barton <alex(a)barton.de> Date: Wed Mar 23 01:08:49 2011 +0100 Update INSTALL text --- INSTALL | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/INSTALL b/INSTALL index 601ec2d..8547efc 100644 --- a/INSTALL +++ b/INSTALL @@ -73,7 +73,8 @@ location, /usr/local/sbin/. The next step is to configure and afterwards starting the daemon. Please have a look at the ngircd(8) and ngircd.conf(5) manual pages for details -and all possible options. +and all possible options -- and don't forget to run "ngircd --configtest" +to validate your configuration file! If no previous version of the configuration file exists (the standard name is /usr/local/etc/ngircd.conf), a sample configuration file containing all @@ -128,11 +129,12 @@ the local system. Normally, root privileges are necessary to complete this step. If there is already an older configuration file present, it won't be overwritten. -This files will be installed by default: +These files and folders will be installed by default: - /usr/local/sbin/ngircd: executable server - /usr/local/etc/ngircd.conf: sample configuration (if not already present) - /usr/local/share/doc/ngircd/: documentation +- /usr/local/share/man/: manual pages III. Additional features @@ -226,19 +228,20 @@ V. Sample configuration file ngircd.conf In the sample configuration file, there are comments beginning with "#" OR ";" -- this is only for the better understanding of the file. -The file is separated in four blocks: [Global], [Operator], [Server], and -[Channel]. +The file is separated in five blocks: [Global], [Features], [Operator], +[Server], and [Channel]. In the [Global] section, there is the main configuration like the server -name and the ports, on which the server should be listening. IRC operators -of this server are defined in [Operator] blocks. [Server] is the section -where server links are configured. And [Channel] blocks are used to -configure pre-defined ("persistent") IRC channels. +name and the ports, on which the server should be listening. Options in +the [Features] section enable or disable functionality in the daemon. +IRC operators of this server are defined in [Operator] blocks, remote +servers are configured in [Server] sections, and [Channel] blocks are +used to configure pre-defined ("persistent") IRC channels. The meaning of the variables in the configuration file is explained in the "doc/sample-ngircd.conf", which is used as sample configuration file in /usr/local/etc after running "make install" (if you don't already have one) -and in the "ngircd.conf" manual page. +and in the ngircd.conf(5) manual page. VI. Command line options @@ -263,3 +266,5 @@ These parameters could be passed to the ngIRCd: Use "--help" to see a short help text describing all available parameters the server understands, with "--version" the ngIRCd shows its version number. In both cases the server exits after the output. + +Please see the ngircd(8) manual page for complete details!

1 0

Alexander Barton : Generate WALLOPS message on SQUIT from IRC operator
by alex＠arthur.barton.de 22 Mär '11

22 Mär '11

Module: ngircd.git Branch: master Commit: 770a58ac6df8099cfa8e7cf3b105ef495f2cf437 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=770a58ac… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 23:51:53 2011 +0100 Generate WALLOPS message on SQUIT from IRC operator So SQUIT now behaves like CONNECT and DISCONNECT commands, when called by an IRC operator (and not received from an other server). --- src/ngircd/irc-server.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index b592eb9..cca295a 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -277,6 +277,7 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) char msg[COMMAND_LEN], logmsg[COMMAND_LEN]; CLIENT *from, *target; CONN_ID con; + int loglevel; assert(Client != NULL); assert(Req != NULL); @@ -301,7 +302,11 @@ IRC_SQUIT(CLIENT * Client, REQUEST * Req) return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID(Client), Req->prefix); - Log(LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", + if (Client_Type(Client) == CLIENT_USER) + loglevel = LOG_NOTICE | LOG_snotice; + else + loglevel = LOG_DEBUG; + Log(loglevel, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID(from), Req->argv[0], Req->argv[1]); target = Client_Search(Req->argv[0]);

1 0

Alexander Barton : Allow servers to send more commands in the first 10 secods
by alex＠arthur.barton.de 21 Mär '11

21 Mär '11

Module: ngircd.git Branch: master Commit: 62f705f97e580fe61520793b3387081915f240ba URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=62f705f9… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 09:42:01 2011 +0100 Allow servers to send more commands in the first 10 secods This helps to speed up server login and network synchronisation. --- src/ngircd/conn.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 397bc91..63093c2 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1629,18 +1629,25 @@ Handle_Buffer(CONN_ID Idx) CLIENT *c; c = Conn_GetClient(Idx); - assert( c != NULL); + starttime = time(NULL); + + assert(c != NULL); /* Servers do get special command limits, so they can process * all the messages that are required while peering. */ switch (Client_Type(c)) { case CLIENT_SERVER: - maxcmd = MAX_COMMANDS_SERVER; break; + /* Allow servers to send more commands in the first 10 secods + * to speed up server login and network synchronisation. */ + if (starttime - Client_StartTime(c) < 10) + maxcmd = MAX_COMMANDS_SERVER * 5; + else + maxcmd = MAX_COMMANDS_SERVER; + break; case CLIENT_SERVICE: maxcmd = MAX_COMMANDS_SERVICE; break; } - starttime = time(NULL); for (i=0; i < maxcmd; i++) { /* Check penalty */ if (My_Connections[Idx].delaytime > starttime)

1 0

Alexander Barton : Commands received from other servers must have prefixes
by alex＠arthur.barton.de 21 Mär '11

21 Mär '11

Module: ngircd.git Branch: master Commit: 15775e67900d914cc174aa80e615fa24d65d115c URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=15775e67… Author: Alexander Barton <alex(a)barton.de> Date: Mon Mar 21 10:46:09 2011 +0100 Commands received from other servers must have prefixes Make sure that all commands received from other servers do have valid prefixes. Only exceptions are PING and ERROR commands that can occure without prefixes when generated by the remote peer itself. --- src/ngircd/parse.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 8203dd0..31f048c 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -276,11 +276,24 @@ Validate_Prefix( CONN_ID Idx, REQUEST *Req, bool *Closed ) *Closed = false; - if( ! Req->prefix ) return true; - client = Conn_GetClient( Idx ); assert( client != NULL ); + if (!Req->prefix && Client_Type(client) == CLIENT_SERVER + && strcasecmp(Req->command, "ERROR") != 0 + && strcasecmp(Req->command, "PING") != 0) + { + Log(LOG_ERR, + "Received command without prefix (connection %d, command \"%s\")!?", + Idx, Req->command); + if (!Conn_WriteStr(Idx, "ERROR :Prefix missing")) + *Closed = true; + return false; + } + + if (!Req->prefix) + return true; + /* only validate if this connection is already registered */ if (Client_Type(client) != CLIENT_USER && Client_Type(client) != CLIENT_SERVER

1 0

Alexander Barton : Handle_GLOBAL(): don't use multi-line strings
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: dcb1951efdc21fc175817bca67aed01bee9749b4 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=dcb1951e… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:28:38 2011 +0100 Handle_GLOBAL(): don't use multi-line strings They aren't supported by elder C compilers ... --- src/ngircd/conf.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index fb8db2c..d27a2dd 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -1128,8 +1128,7 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) } if (CheckLegacyNoOption(Var, Arg)) { - Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use " - "\"%s = %s\" in [FEATURES] section instead", + Config_Error(LOG_WARNING, "%s, line %d: \"No\"-Prefix has been removed, use \"%s = %s\" in [FEATURES] section instead", NGIRCd_ConfFile, Line, NoNo(Var), InvertArg(Arg)); if (strcasecmp(Var, "NoIdent") == 0) WarnIdent(Line);

1 0

Alexander Barton : IRC_CHANINFO(): Code cleanup
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: a39e2f22c928a8bd8d16c2e008a62800f6412fe6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=a39e2f22… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 17:29:19 2011 +0100 IRC_CHANINFO(): Code cleanup --- src/ngircd/irc-channel.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/ngircd/irc-channel.c b/src/ngircd/irc-channel.c index 33ea68d..476c313 100644 --- a/src/ngircd/irc-channel.c +++ b/src/ngircd/irc-channel.c @@ -688,7 +688,9 @@ IRC_CHANINFO( CLIENT *Client, REQUEST *Req ) assert( Req != NULL ); /* Bad number of parameters? */ - if(( Req->argc < 2 ) || ( Req->argc == 4 ) || ( Req->argc > 5 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if (Req->argc < 2 || Req->argc == 4 || Req->argc > 5) + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); /* Compatibility kludge */ if( Req->argc == 5 ) arg_topic = 4;

1 0

Alexander Barton : Rename ClientHost to CloakHost, and ClientUserNick to CloakUserToNick
by alex＠arthur.barton.de 19 Mär '11

19 Mär '11

Module: ngircd.git Branch: master Commit: ae7470ceb546d87cbd366d508641276313ec9130 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=ae7470ce… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 19 16:58:29 2011 +0100 Rename ClientHost to CloakHost, and ClientUserNick to CloakUserToNick --- doc/sample-ngircd.conf.tmpl | 6 +++--- man/ngircd.conf.5.tmpl | 4 ++-- src/ngircd/client.c | 8 ++++---- src/ngircd/conf.c | 19 ++++++++++--------- src/ngircd/conf.h | 12 +++++++----- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index fee3570..a2eeee9 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -154,11 +154,11 @@ # maximum nick name length! ;MaxNickLength = 9 - # Set this hostname for every client instead of the real one - ;ClientHost = irc.example.net + # Set this hostname for every client instead of the real one. + ;CloakHost = irc.example.net # Set every clients' user name to their nick name - ;ClientUserNick = yes + ;CloakUserToNick = yes [Features] # Do any DNS lookups when a client connects to the server. diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index 3282476..fa77c64 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -237,11 +237,11 @@ Maximum length of an user nick name (Default: 9, as in RFC 2812). Please note that all servers in an IRC network MUST use the same maximum nick name length! .TP -\fBClientHost\fR +\fBCloakHost\fR Set this hostname for every client instead of the real one. Default: empty, don't change. .TP -\fBClientUserNick\fR +\fBCloakUserToNick\fR Set every clients' user name to their nick name and hide the one supplied by the IRC client. Default: no. .SH [OPERATOR] diff --git a/src/ngircd/client.c b/src/ngircd/client.c index 1a6ad93..e01c424 100644 --- 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,7 +335,7 @@ Client_SetID( CLIENT *Client, const char *ID ) strlcpy( Client->id, ID, sizeof( Client->id )); - if (Conf_ClientUserNick) + if (Conf_CloakUserToNick) strlcpy( Client->user, ID, sizeof( Client->user )); /* Hash */ @@ -351,7 +351,7 @@ Client_SetUser( CLIENT *Client, const char *User, bool Idented ) assert( Client != NULL ); assert( User != NULL ); - if (Conf_ClientUserNick) return; + if (Conf_CloakUserToNick) return; if (Idented) { strlcpy(Client->user, User, sizeof(Client->user)); diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 12893ad..fb8db2c 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -352,8 +352,8 @@ Conf_Test( void ) printf(" MaxConnectionsIP = %d\n", Conf_MaxConnectionsIP); printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); - printf(" ClientHost = %s\n", Conf_ClientHost); - printf(" ClientUserNick = %s\n\n", yesno_to_str(Conf_ClientUserNick)); + printf(" CloakHost = %s\n", Conf_CloakHost); + printf(" CloakUserToNick = %s\n\n", yesno_to_str(Conf_CloakUserToNick)); puts("[FEATURES]"); printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); @@ -592,8 +592,6 @@ Set_Defaults(bool InitServers) int i; strcpy(Conf_ServerName, ""); - strcpy(Conf_ClientHost, ""); - Conf_ClientUserNick = false; snprintf(Conf_ServerInfo, sizeof Conf_ServerInfo, "%s %s", PACKAGE_NAME, PACKAGE_VERSION); strcpy(Conf_ServerPwd, ""); @@ -633,6 +631,9 @@ Set_Defaults(bool InitServers) Conf_MaxJoins = 10; Conf_MaxNickLength = CLIENT_NICK_LEN_DEFAULT; + strcpy(Conf_CloakHost, ""); + Conf_CloakUserToNick = false; + #ifdef SYSLOG #ifdef LOG_LOCAL5 Conf_SyslogFacility = LOG_LOCAL5; @@ -974,16 +975,16 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "ClientHost" ) == 0 ) { + if( strcasecmp( Var, "CloakHost" ) == 0 ) { /* Client hostname */ - len = strlcpy( Conf_ClientHost, Arg, sizeof( Conf_ClientHost )); - if (len >= sizeof( Conf_ClientHost )) + len = strlcpy( Conf_CloakHost, Arg, sizeof( Conf_CloakHost )); + if (len >= sizeof( Conf_CloakHost )) Config_Error_TooLong( Line, Var ); return; } - if( strcasecmp( Var, "ClientUserNick" ) == 0 ) { + if( strcasecmp( Var, "CloakUserToNick" ) == 0 ) { /* Use client nick name as user name */ - Conf_ClientUserNick = Check_ArgIsTrue( Arg ); + Conf_CloakUserToNick = Check_ArgIsTrue( Arg ); return; } if( strcasecmp( Var, "Info" ) == 0 ) { diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 10b6407..305ccaa 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001-2010 Alexander Barton (alex(a)barton.de) + * Copyright (c)2001-2011 Alexander Barton (alex(a)barton.de) and Contributors. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -97,10 +97,6 @@ struct Conf_Channel { /** Name (ID, "nick") of this server */ GLOBAL char Conf_ServerName[CLIENT_ID_LEN]; -/** Hostname of the clients */ -GLOBAL char Conf_ClientHost[CLIENT_ID_LEN]; -GLOBAL bool Conf_ClientUserNick; - /** Server info text */ GLOBAL char Conf_ServerInfo[CLIENT_INFO_LEN]; @@ -167,6 +163,12 @@ GLOBAL bool Conf_OperServerMode; /** Flag indicating if remote IRC operators are allowed to manage this server */ GLOBAL bool Conf_AllowRemoteOper; +/** Cloaked hostname of the clients */ +GLOBAL char Conf_CloakHost[CLIENT_ID_LEN]; + +/** Use nick name as user name? */ +GLOBAL bool Conf_CloakUserToNick; + /** Enable all DNS functions? */ GLOBAL bool Conf_DNS;

1 0