commit 5545e1bebf31ddb9f89c80979c0be93e3fdf6f0c from: Peter Powell date: Tue Jul 14 13:43:19 2015 UTC Rename NoticeAuth to NoticeBeforeRegistration. The old name is still supported for compatibility reasons. commit - d118cd74b6ff342b978b493d56f9306028e364cf commit + 5545e1bebf31ddb9f89c80979c0be93e3fdf6f0c blob - c39df5943e31a0995e5848cef8278007c75e27a2 blob + a4346b1e87488935551807d535fd1a6e548e08f7 --- doc/sample-ngircd.conf.tmpl +++ doc/sample-ngircd.conf.tmpl @@ -195,7 +195,7 @@ # Normally ngIRCd doesn't send any messages to a client until it is # 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? blob - 7996c62806a760a39de4e9514046029644b4b67b blob + 8c62709cdf2758802f5febf5901ab9c8d30d16ab --- man/ngircd.conf.5.tmpl +++ man/ngircd.conf.5.tmpl @@ -299,7 +299,7 @@ anonymizing software such as TOR or I2P and one does n 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 *" messages to clients while connecting. Default: no. blob - 221e7a96e8621c37b6f2db3d26d4c0accdf9075a blob + 5f8bce5ddbad35586588454a9d9813a7cd63cbbc --- src/ngircd/conf.c +++ 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, 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) { blob - 0d5c56695c8f896c4e442bb96e76759dc118c2d3 blob + 70de20af9edbb6321b739eac123124baa74e5575 --- src/ngircd/conf.h +++ src/ngircd/conf.h @@ -195,7 +195,7 @@ GLOBAL bool Conf_Ident; GLOBAL bool Conf_MorePrivacy; /** Enable "NOTICE *" messages on connect */ -GLOBAL bool Conf_NoticeAuth; +GLOBAL bool Conf_NoticeBeforeRegistration; /** Enable all usage of PAM, even when compiled with support for it */ GLOBAL bool Conf_PAM; blob - daf496b4186a58d3f43ba8c22339918a318e05e1 blob + 6b3b51eaf5c10dc6b8555d8a99b53dee3b178a79 --- src/ngircd/conn.c +++ src/ngircd/conn.c @@ -1487,7 +1487,7 @@ Conn_StartLogin(CONN_ID Idx) ident_sock = My_Connections[Idx].sock; #endif - if (Conf_NoticeAuth) { + if (Conf_NoticeBeforeRegistration) { /* Send "NOTICE *" messages to the client */ #ifdef IDENTAUTH if (Conf_Ident) @@ -2265,7 +2265,7 @@ 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 * :*** Found your hostname: %s", My_Connections[i].host); @@ -2291,7 +2291,7 @@ 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 * :*** Got %sident response%s%s", *ptr ? "invalid " : "", @@ -2300,13 +2300,13 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events } } 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 * :*** 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! */