- ngIRCd GIT Updates - lists.barton.de

Alexander Barton : Add documentation for "NoticeAuth" configuration option
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: 680db6755bdd7904a5aaae8290e074cb008425b5 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=680db675… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 27 20:40:28 2011 +0200 Add documentation for "NoticeAuth" configuration option --- doc/sample-ngircd.conf.tmpl | 5 +++++ man/ngircd.conf.5.tmpl | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl index e07b520..f9c9656 100644 --- a/doc/sample-ngircd.conf.tmpl +++ b/doc/sample-ngircd.conf.tmpl @@ -154,6 +154,11 @@ # maximum nick name length! ;MaxNickLength = 9 + # Normally ngIRCd doesn't send any messages to a client until it is + # registered. Enable this option to let the daemon send "NOTICE AUTH" + # messages to clients while connecting. + ;NoticeAuth = no + # Set this hostname for every client instead of the real one. # Please note: don't use the percentage sign ("%"), it is reserved for # future extensions! diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index e53cf3c..5d6f0e0 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -251,6 +251,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 +\fBNoticeAuth\fR (boolean) +Normally ngIRCd doesn't send any messages to a client until it is registered. +Enable this option to let the daemon send "NOTICE AUTH" messages to clients +while connecting. Default: no. +.TP \fBCloakHost\fR Set this hostname for every client instead of the real one. Default: empty, don't change.

1 0

Alexander Barton : Merge branch 'NoticeAuth'
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: cf7e3b1c0201ec298acb43e52dc1f05abcb8c80d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=cf7e3b1c… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 27 20:56:50 2011 +0200 Merge branch 'NoticeAuth' * NoticeAuth: Add documentation for "NoticeAuth" configuration option Configuration: move "NoticeAuth" to GLOBAL section New configuration option "NoticeAuth": send NOTICE AUTH on connect ---

1 0

Alexander Barton : New configuration option "NoticeAuth": send NOTICE AUTH on connect
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: d29e389779dfeda52cb42e8b8f2cf36c4bd9cd56 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d29e3897… Author: Alexander Barton <alex(a)barton.de> Date: Fri Mar 25 12:08:36 2011 +0100 New configuration option "NoticeAuth": send NOTICE AUTH on connect When enabling "NoticeAuth" in the [Features] section, ngircd will send "NOTICE AUTH" messages on client connect like e.g. snircd (QuakeNet) does. --- src/ngircd/conf.c | 7 +++++++ src/ngircd/conf.h | 3 +++ src/ngircd/conn.c | 22 +++++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 32461f3..85e4233 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -359,6 +359,7 @@ Conf_Test( void ) printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); + printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth)); puts(""); opers_puts(); @@ -614,6 +615,7 @@ Set_Defaults(bool InitServers) Conf_PongTimeout = 20; Conf_ConnectRetry = 60; Conf_DNS = true; + Conf_NoticeAuth = false; Conf_Oper_Count = 0; Conf_Channel_Count = 0; @@ -1278,6 +1280,11 @@ Handle_FEATURES(int Line, char *Var, char *Arg) WarnPAM(Line); return; } + if(strcasecmp(Var, "NoticeAuth") == 0) { + /* send NOTICE AUTH messages to clients on connect */ + Conf_NoticeAuth = Check_ArgIsTrue(Arg); + return; + } Config_Error(LOG_ERR, "%s, line %d (section \"Features\"): Unknown variable \"%s\"!", diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 305ccaa..1633bc9 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -178,6 +178,9 @@ GLOBAL bool Conf_Ident; /** Enable all usage of PAM, even when compiled with support for it */ GLOBAL bool Conf_PAM; +/** Enable NOTICE AUTH messages on connect */ +GLOBAL bool Conf_NoticeAuth; + /* * try to connect to remote systems using the ipv6 protocol, * if they have an ipv6 address? (default yes) diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 63093c2..9d17a73 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1444,9 +1444,20 @@ New_Connection(int Sock) if (!Conf_Ident) identsock = -1; #endif - if (Conf_DNS) + if (Conf_DNS) { + if (Conf_NoticeAuth) { +#ifdef IDENTAUTH + if (Conf_Ident) + (void)Conn_WriteStr(new_sock, + "NOTICE AUTH :*** Looking up your hostname and checking ident"); + else +#endif + (void)Conn_WriteStr(new_sock, + "NOTICE AUTH :*** Looking up your hostname"); + } Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr, identsock, cb_Read_Resolver_Result); + } Account_Connection(); return new_sock; @@ -2175,13 +2186,22 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) strlcpy(My_Connections[i].host, readbuf, sizeof(My_Connections[i].host)); Client_SetHostname(c, readbuf); + if (Conf_NoticeAuth) + (void)Conn_WriteStr(i, + "NOTICE AUTH :*** Found your hostname"); #ifdef IDENTAUTH ++identptr; if (*identptr) { Log(LOG_INFO, "IDENT lookup for connection %d: \"%s\".", i, identptr); Client_SetUser(c, identptr, true); + if (Conf_NoticeAuth) + (void)Conn_WriteStr(i, + "NOTICE AUTH :*** Got ident response"); } else { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); + if (Conf_NoticeAuth && Conf_Ident) + (void)Conn_WriteStr(i, + "NOTICE AUTH :*** No ident response"); } #endif }

1 0

Alexander Barton : Configuration: move "NoticeAuth" to GLOBAL section
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: f99d33ddd93b41eca3fd113ba5308cffdba58142 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=f99d33dd… Author: Alexander Barton <alex(a)barton.de> Date: Sat Mar 26 17:11:44 2011 +0100 Configuration: move "NoticeAuth" to GLOBAL section --- src/ngircd/conf.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 85e4233..568b9e7 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -352,6 +352,7 @@ 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(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth)); printf(" CloakHost = %s\n", Conf_CloakHost); printf(" CloakUserToNick = %s\n\n", yesno_to_str(Conf_CloakUserToNick)); @@ -359,7 +360,6 @@ Conf_Test( void ) printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); - printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth)); puts(""); opers_puts(); @@ -1194,6 +1194,11 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) Conf_MaxNickLength = Handle_MaxNickLength(Line, Arg); return; } + if(strcasecmp(Var, "NoticeAuth") == 0) { + /* send NOTICE AUTH messages to clients on connect */ + Conf_NoticeAuth = Check_ArgIsTrue(Arg); + return; + } if( strcasecmp( Var, "Listen" ) == 0 ) { /* IP-Address to bind sockets */ @@ -1280,11 +1285,6 @@ Handle_FEATURES(int Line, char *Var, char *Arg) WarnPAM(Line); return; } - if(strcasecmp(Var, "NoticeAuth") == 0) { - /* send NOTICE AUTH messages to clients on connect */ - Conf_NoticeAuth = Check_ArgIsTrue(Arg); - return; - } Config_Error(LOG_ERR, "%s, line %d (section \"Features\"): Unknown variable \"%s\"!",

1 0

Alexander Barton : New configuration option "RequireAuthPing": PING-PONG on login
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: 162433398e320c45f3c8a523814518aa6b78372e URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=16243339… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 27 19:33:48 2011 +0200 New configuration option "RequireAuthPing": PING-PONG on login When enabled, this configuration option lets ngIRCd send a PING with an numeric "token" to clients logging in; and it will not become registered in the network until the client responds with the correct PONG. This is used by QuakeNet for example (ircu/snircd), and looks like this: NICK nick :irc.example.net PING :1858979527 USER user . . :real name PONG 1858979527 :irc.example.net 001 nick :Welcome to the Internet Relay Network ... --- src/ngircd/client.h | 3 ++ src/ngircd/conf.c | 19 ++++++++++- src/ngircd/conf.h | 7 ++++ src/ngircd/conn.c | 19 +++++++++++ src/ngircd/conn.h | 8 +++++ src/ngircd/irc-login.c | 82 ++++++++++++++++++++++++++++++++++++++++------- src/ngircd/ngircd.c | 2 + src/ngircd/parse.c | 2 +- 8 files changed, 126 insertions(+), 16 deletions(-) diff --git a/src/ngircd/client.h b/src/ngircd/client.h index ff4ff2f..fecf5d9 100644 --- a/src/ngircd/client.h +++ b/src/ngircd/client.h @@ -26,6 +26,9 @@ #define CLIENT_SERVICE 64 /* client is a service */ #define CLIENT_UNKNOWNSERVER 128 /* unregistered server connection */ #define CLIENT_GOTPASS_2813 256 /* client did send PASS, RFC 2813 style */ +#ifndef STRICT_RFC +# define CLIENT_WAITAUTHPING 512 /* waiting for AUTH PONG from client */ +#endif #define CLIENT_TYPE int diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c index 32461f3..452f744 100644 --- a/src/ngircd/conf.c +++ b/src/ngircd/conf.c @@ -353,9 +353,12 @@ Conf_Test( void ) printf(" MaxJoins = %d\n", Conf_MaxJoins > 0 ? Conf_MaxJoins : -1); printf(" MaxNickLength = %u\n", Conf_MaxNickLength - 1); printf(" CloakHost = %s\n", Conf_CloakHost); - printf(" CloakUserToNick = %s\n\n", yesno_to_str(Conf_CloakUserToNick)); + printf(" CloakUserToNick = %s\n", yesno_to_str(Conf_CloakUserToNick)); +#ifndef STRICT_RFC + printf(" RequireAuthPing = %s\n", yesno_to_str(Conf_AuthPing)); +#endif - puts("[FEATURES]"); + printf("\n[FEATURES]\n"); printf(" DNS = %s\n", yesno_to_str(Conf_DNS)); printf(" Ident = %s\n", yesno_to_str(Conf_Ident)); printf(" PAM = %s\n", yesno_to_str(Conf_PAM)); @@ -641,6 +644,11 @@ Set_Defaults(bool InitServers) Conf_SyslogFacility = 0; #endif #endif + +#ifndef STRICT_RFC + Conf_AuthPing = false; +#endif + Set_Defaults_Optional(); /* Initialize server configuration structures */ @@ -1249,6 +1257,13 @@ Handle_GLOBAL( int Line, char *Var, char *Arg ) return; } #endif +#ifndef STRICT_RFC + if (strcasecmp(Var, "RequireAuthPing") == 0 ) { + /* Require new clients to do an "autheticatin PING-PONG" */ + Conf_AuthPing = Check_ArgIsTrue(Arg); + return; + } +#endif Config_Error(LOG_ERR, "%s, line %d (section \"Global\"): Unknown variable \"%s\"!", NGIRCd_ConfFile, Line, Var); } /* Handle_GLOBAL */ diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h index 305ccaa..a183fce 100644 --- a/src/ngircd/conf.h +++ b/src/ngircd/conf.h @@ -199,6 +199,13 @@ GLOBAL int Conf_MaxConnectionsIP; /** Maximum length of a nick name */ GLOBAL unsigned int Conf_MaxNickLength; +#ifndef STRICT_RFC + +/** Require "AUTH PING-PONG" on login */ +GLOBAL bool Conf_AuthPing; + +#endif + #ifdef SYSLOG /* Syslog "facility" */ diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index 63093c2..275215d 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -2283,6 +2283,25 @@ Conn_GetFromProc(int fd) } /* Conn_GetFromProc */ +#ifndef STRICT_RFC + +GLOBAL long +Conn_GetAuthPing(CONN_ID Idx) +{ + assert (Idx != NONE); + return My_Connections[Idx].auth_ping; +} /* Conn_GetAuthPing */ + +GLOBAL void +Conn_SetAuthPing(CONN_ID Idx, long ID) +{ + assert (Idx != NONE); + My_Connections[Idx].auth_ping = ID; +} /* Conn_SetAuthPing */ + +#endif + + #ifdef SSL_SUPPORT /** diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index 4228c9e..c813729 100644 --- a/src/ngircd/conn.h +++ b/src/ngircd/conn.h @@ -91,6 +91,9 @@ typedef struct _Connection #ifdef SSL_SUPPORT struct ConnSSL_State ssl_state; /* SSL/GNUTLS state information */ #endif +#ifndef STRICT_RFC + long auth_ping; /** PING response expected on login */ +#endif } CONNECTION; GLOBAL CONNECTION *My_Connections; @@ -132,6 +135,11 @@ GLOBAL long Conn_Count PARAMS((void)); GLOBAL long Conn_CountMax PARAMS((void)); GLOBAL long Conn_CountAccepted PARAMS((void)); +#ifndef STRICT_RFC +GLOBAL long Conn_GetAuthPing PARAMS((CONN_ID Idx)); +GLOBAL void Conn_SetAuthPing PARAMS((CONN_ID Idx, long ID)); +#endif + #ifdef DEBUG GLOBAL void Conn_DebugDump PARAMS((void)); #endif diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 92d54ab..2e99d66 100644 --- a/src/ngircd/irc-login.c +++ b/src/ngircd/irc-login.c @@ -271,6 +271,17 @@ IRC_NICK( CLIENT *Client, REQUEST *Req ) /* Register new nickname of this client */ Client_SetID( target, Req->argv[0] ); +#ifndef STRICT_RFC + if (Conf_AuthPing) { + Conn_SetAuthPing(Client_Conn(Client), random()); + IRC_WriteStrClient(Client, "PING :%ld", + Conn_GetAuthPing(Client_Conn(Client))); + LogDebug("Connection %d: sent AUTH PING %ld ...", + Client_Conn(Client), + Conn_GetAuthPing(Client_Conn(Client))); + } +#endif + /* If we received a valid USER command already then * register the new client! */ if( Client_Type( Client ) == CLIENT_GOTUSER ) @@ -797,18 +808,32 @@ GLOBAL bool IRC_PONG(CLIENT *Client, REQUEST *Req) { CLIENT *target, *from; + CONN_ID conn; +#ifndef STRICT_RFC + long auth_ping; +#endif char *s; assert(Client != NULL); assert(Req != NULL); /* Wrong number of arguments? */ - if (Req->argc < 1) - return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG, - Client_ID(Client)); - if (Req->argc > 2) - return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, - Client_ID(Client), Req->command); + if (Req->argc < 1) { + if (Client_Type(Client) == CLIENT_USER) + return IRC_WriteStrClient(Client, ERR_NOORIGIN_MSG, + Client_ID(Client)); + else + return CONNECTED; + } + if (Req->argc > 2) { + if (Client_Type(Client) == CLIENT_USER) + return IRC_WriteStrClient(Client, + ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), + Req->command); + else + return CONNECTED; + } /* Forward? */ if (Req->argc == 2 && Client_Type(Client) == CLIENT_SERVER) { @@ -837,15 +862,35 @@ IRC_PONG(CLIENT *Client, REQUEST *Req) /* The connection timestamp has already been updated when the data has * been read from so socket, so we don't need to update it here. */ + + conn = Client_Conn(Client); + +#ifndef STRICT_RFC + /* Check authentication PING-PONG ... */ + auth_ping = Conn_GetAuthPing(conn); + if (auth_ping) { + LogDebug("AUTH PONG: waiting for token \"%ld\", got \"%s\" ...", + auth_ping, Req->argv[0]); + if (auth_ping == atoi(Req->argv[0])) { + Conn_SetAuthPing(conn, 0); + if (Client_Type(Client) == CLIENT_WAITAUTHPING) + Hello_User(Client); + } else + if (!IRC_WriteStrClient(Client, + "To connect, type /QUOTE PONG %ld", + auth_ping)) + return DISCONNECTED; + } +#endif + #ifdef DEBUG - if (Client_Conn(Client) > NONE) + if (conn > NONE) Log(LOG_DEBUG, - "Connection %d: received PONG. Lag: %ld seconds.", - Client_Conn(Client), + "Connection %d: received PONG. Lag: %ld seconds.", conn, time(NULL) - Conn_LastPing(Client_Conn(Client))); else Log(LOG_DEBUG, - "Connection %d: received PONG.", Client_Conn(Client)); + "Connection %d: received PONG.", conn); #endif return CONNECTED; } /* IRC_PONG */ @@ -867,12 +912,25 @@ Hello_User(CLIENT * Client) { #ifdef PAM int pipefd[2], result; - CONN_ID conn; pid_t pid; +#endif + CONN_ID conn; assert(Client != NULL); conn = Client_Conn(Client); +#ifndef STRICT_RFC + if (Conf_AuthPing) { + /* Did we receive the "auth PONG" already? */ + if (Conn_GetAuthPing(conn)) { + Client_SetType(Client, CLIENT_WAITAUTHPING); + LogDebug("Connection %d: Waiting for AUTH PONG ...", conn); + return CONNECTED; + } + } +#endif + +#ifdef PAM if (!Conf_PAM) { /* Don't do any PAM authentication at all, instead emulate * the beahiour of the daemon compiled without PAM support: @@ -903,8 +961,6 @@ Hello_User(CLIENT * Client) exit(0); } #else - assert(Client != NULL); - /* Check global server password ... */ if (strcmp(Client_Password(Client), Conf_ServerPwd) != 0) { /* Bad password! */ diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c index 4b49ec6..74a9988 100644 --- a/src/ngircd/ngircd.c +++ b/src/ngircd/ngircd.c @@ -289,6 +289,8 @@ main( int argc, const char *argv[] ) exit(1); } + srandom(getpid()); + /* Create protocol and server identification. The syntax * used by ngIRCd in PASS commands and the known "extended * flags" are described in doc/Protocol.txt. */ diff --git a/src/ngircd/parse.c b/src/ngircd/parse.c index 31f048c..8f5e601 100644 --- a/src/ngircd/parse.c +++ b/src/ngircd/parse.c @@ -82,7 +82,7 @@ static COMMAND My_Commands[] = { "PART", IRC_PART, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "PASS", IRC_PASS, 0xFFFF, 0, 0, 0 }, { "PING", IRC_PING, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, - { "PONG", IRC_PONG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, + { "PONG", IRC_PONG, 0xFFFF, 0, 0, 0 }, { "PRIVMSG", IRC_PRIVMSG, CLIENT_USER|CLIENT_SERVER, 0, 0, 0 }, { "QUIT", IRC_QUIT, 0xFFFF, 0, 0, 0 }, { "REHASH", IRC_REHASH, CLIENT_USER, 0, 0, 0 },

1 0

Alexander Barton : ngircd.conf.5: Add variable type to "CloakHost" and " CloakUserToNick"
by alex＠arthur.barton.de 27 Mär '11

27 Mär '11

Module: ngircd.git Branch: master Commit: 1b5d1064deb4a4e382be1132e2ef058a8dc415f6 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=1b5d1064… Author: Alexander Barton <alex(a)barton.de> Date: Sun Mar 27 20:45:29 2011 +0200 ngircd.conf.5: Add variable type to "CloakHost" and "CloakUserToNick" --- man/ngircd.conf.5.tmpl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl index e53cf3c..e94b495 100644 --- a/man/ngircd.conf.5.tmpl +++ b/man/ngircd.conf.5.tmpl @@ -251,7 +251,7 @@ 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 -\fBCloakHost\fR +\fBCloakHost\fR (string) Set this hostname for every client instead of the real one. Default: empty, don't change. .PP @@ -261,7 +261,7 @@ don't change. Don't use the percentage sign ("%"), it is reserved for future extensions! .RE .TP -\fBCloakUserToNick\fR +\fBCloakUserToNick\fR (boolean) Set every clients' user name to their nick name and hide the one supplied by the IRC client. Default: no. .SH [OPERATOR]

1 0

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