ngircd

Free, portable and lightweight Internet Relay Chat server http://ngircd.barton.de/
Log | Files | Refs | README | LICENSE

commit 64c265cf33d09cfb9ab5e7d0bbc8033dc85f7c64
parent b72a7a4b96df11859dd5f5d7112d9d1409a9f0e5
Author: Alexander Barton <alex@barton.de>
Date:   Sat,  1 Aug 2015 14:51:04 +0200

Merge pull request #217 from SaberUK/master+notice-auth

Use "NOTICE *" before registration instead of "NOTICE AUTH".
Diffstat:
Mdoc/sample-ngircd.conf.tmpl | 4++--
Mman/ngircd.conf.5.tmpl | 4++--
Msrc/ngircd/conf.c | 8++++----
Msrc/ngircd/conf.h | 4++--
Msrc/ngircd/conn.c | 22+++++++++++-----------
5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl @@ -193,9 +193,9 @@ ;MorePrivacy = no # Normally ngIRCd doesn't send any messages to a client until it is - # registered. Enable this option to let the daemon send "NOTICE AUTH" + # registered. Enable this option to let the daemon send "NOTICE *" # messages to clients while connecting. - ;NoticeAuth = no + ;NoticeBeforeRegistration = no # Should IRC Operators be allowed to use the MODE command even if # they are not(!) channel-operators? diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl @@ -299,9 +299,9 @@ anonymizing software such as TOR or I2P and one does not wish to make it too easy to collect statistics on the users. Default: no. .TP -\fBNoticeAuth\fR (boolean) +\fBNoticeBeforeRegistration\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 +Enable this option to let the daemon send "NOTICE *" messages to clients while connecting. Default: no. .TP \fBOperCanUseMode\fR (boolean) diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c @@ -412,7 +412,7 @@ Conf_Test( void ) #endif printf(" IncludeDir = %s\n", Conf_IncludeDir); printf(" MorePrivacy = %s\n", yesno_to_str(Conf_MorePrivacy)); - printf(" NoticeAuth = %s\n", yesno_to_str(Conf_NoticeAuth)); + printf(" NoticeBeforeRegistration = %s\n", yesno_to_str(Conf_NoticeBeforeRegistration)); printf(" OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode)); printf(" OperChanPAutoOp = %s\n", yesno_to_str(Conf_OperChanPAutoOp)); printf(" OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode)); @@ -797,7 +797,7 @@ Set_Defaults(bool InitServers) #endif strcpy(Conf_IncludeDir, ""); Conf_MorePrivacy = false; - Conf_NoticeAuth = false; + Conf_NoticeBeforeRegistration = false; Conf_OperCanMode = false; Conf_OperChanPAutoOp = true; Conf_OperServerMode = false; @@ -1796,8 +1796,8 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg) Conf_MorePrivacy = Check_ArgIsTrue(Arg); return; } - if (strcasecmp(Var, "NoticeAuth") == 0) { - Conf_NoticeAuth = Check_ArgIsTrue(Arg); + if (strcasecmp(Var, "NoticeBeforeRegistration") == 0 || strcasecmp(Var, "NoticeAuth") == 0) { + Conf_NoticeBeforeRegistration = Check_ArgIsTrue(Arg); return; } if (strcasecmp(Var, "OperCanUseMode") == 0) { diff --git a/src/ngircd/conf.h b/src/ngircd/conf.h @@ -194,8 +194,8 @@ GLOBAL bool Conf_Ident; /** Enable "more privacy" mode and "censor" some user-related information */ GLOBAL bool Conf_MorePrivacy; -/** Enable NOTICE AUTH messages on connect */ -GLOBAL bool Conf_NoticeAuth; +/** Enable "NOTICE *" messages on connect */ +GLOBAL bool Conf_NoticeBeforeRegistration; /** Enable all usage of PAM, even when compiled with support for it */ GLOBAL bool Conf_PAM; diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c @@ -1487,16 +1487,16 @@ Conn_StartLogin(CONN_ID Idx) ident_sock = My_Connections[Idx].sock; #endif - if (Conf_NoticeAuth) { - /* Send "NOTICE AUTH" messages to the client */ + if (Conf_NoticeBeforeRegistration) { + /* Send "NOTICE *" messages to the client */ #ifdef IDENTAUTH if (Conf_Ident) (void)Conn_WriteStr(Idx, - "NOTICE AUTH :*** Looking up your hostname and checking ident"); + "NOTICE * :*** Looking up your hostname and checking ident"); else #endif (void)Conn_WriteStr(Idx, - "NOTICE AUTH :*** Looking up your hostname"); + "NOTICE * :*** Looking up your hostname"); /* Send buffered data to the client, but break on errors * because Handle_Write() would have closed the connection * again in this case! */ @@ -2265,9 +2265,9 @@ 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) + if (Conf_NoticeBeforeRegistration) (void)Conn_WriteStr(i, - "NOTICE AUTH :*** Found your hostname: %s", + "NOTICE * :*** Found your hostname: %s", My_Connections[i].host); #ifdef IDENTAUTH ++identptr; @@ -2291,22 +2291,22 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events ) i, identptr); Client_SetUser(c, identptr, true); } - if (Conf_NoticeAuth) { + if (Conf_NoticeBeforeRegistration) { (void)Conn_WriteStr(i, - "NOTICE AUTH :*** Got %sident response%s%s", + "NOTICE * :*** Got %sident response%s%s", *ptr ? "invalid " : "", *ptr ? "" : ": ", *ptr ? "" : identptr); } } else if(Conf_Ident) { Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); - if (Conf_NoticeAuth) + if (Conf_NoticeBeforeRegistration) (void)Conn_WriteStr(i, - "NOTICE AUTH :*** No ident response"); + "NOTICE * :*** No ident response"); } #endif - if (Conf_NoticeAuth) { + if (Conf_NoticeBeforeRegistration) { /* Send buffered data to the client, but break on * errors because Handle_Write() would have closed * the connection again in this case! */