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

Rename NoticeAuth to NoticeBeforeRegistration. 

The old name is still supported for compatibility reasons.
This commit is contained in:
Peter Powell 2015-07-14 14:43:19 +01:00
parent d118cd74b6
commit 5545e1bebf
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@
# Normally ngIRCd doesn't send any messages to a client until it is # Normally ngIRCd doesn't send any messages to a client until it is
# registered. Enable this option to let the daemon send "NOTICE *" # registered. Enable this option to let the daemon send "NOTICE *"
# messages to clients while connecting. # messages to clients while connecting.
;NoticeAuth = no ;NoticeBeforeRegistration = no
# Should IRC Operators be allowed to use the MODE command even if # Should IRC Operators be allowed to use the MODE command even if
# they are not(!) channel-operators? # they are not(!) channel-operators?

2
man/ngircd.conf.5.tmpl
View File

@ -299,7 +299,7 @@ anonymizing software such as TOR or I2P and one does not wish to make it
too easy to collect statistics on the users. too easy to collect statistics on the users.
Default: no. Default: no.
.TP .TP
\fBNoticeAuth\fR (boolean) \fBNoticeBeforeRegistration\fR (boolean)
Normally ngIRCd doesn't send any messages to a client until it is registered. 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 Enable this option to let the daemon send "NOTICE *" messages to clients
while connecting. Default: no. while connecting. Default: no.

8
src/ngircd/conf.c
View File

@ -412,7 +412,7 @@ Conf_Test( void )
#endif #endif
printf(" IncludeDir = %s\n", Conf_IncludeDir); printf(" IncludeDir = %s\n", Conf_IncludeDir);
printf(" MorePrivacy = %s\n", yesno_to_str(Conf_MorePrivacy)); 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(" OperCanUseMode = %s\n", yesno_to_str(Conf_OperCanMode));
printf(" OperChanPAutoOp = %s\n", yesno_to_str(Conf_OperChanPAutoOp)); printf(" OperChanPAutoOp = %s\n", yesno_to_str(Conf_OperChanPAutoOp));
printf(" OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode)); printf(" OperServerMode = %s\n", yesno_to_str(Conf_OperServerMode));
@ -797,7 +797,7 @@ Set_Defaults(bool InitServers)
#endif #endif
strcpy(Conf_IncludeDir, ""); strcpy(Conf_IncludeDir, "");
Conf_MorePrivacy = false; Conf_MorePrivacy = false;
Conf_NoticeAuth = false; Conf_NoticeBeforeRegistration = false;
Conf_OperCanMode = false; Conf_OperCanMode = false;
Conf_OperChanPAutoOp = true; Conf_OperChanPAutoOp = true;
Conf_OperServerMode = false; Conf_OperServerMode = false;
@ -1796,8 +1796,8 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg)
Conf_MorePrivacy = Check_ArgIsTrue(Arg); Conf_MorePrivacy = Check_ArgIsTrue(Arg);
return; return;
} }
if (strcasecmp(Var, "NoticeAuth") == 0) { if (strcasecmp(Var, "NoticeBeforeRegistration") == 0 || strcasecmp(Var, "NoticeAuth") == 0) {
Conf_NoticeAuth = Check_ArgIsTrue(Arg); Conf_NoticeBeforeRegistration = Check_ArgIsTrue(Arg);
return; return;
} }
if (strcasecmp(Var, "OperCanUseMode") == 0) { if (strcasecmp(Var, "OperCanUseMode") == 0) {

2
src/ngircd/conf.h
View File

@ -195,7 +195,7 @@ GLOBAL bool Conf_Ident;
GLOBAL bool Conf_MorePrivacy; GLOBAL bool Conf_MorePrivacy;
/** Enable "NOTICE *" messages on connect */ /** 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 */ /** Enable all usage of PAM, even when compiled with support for it */
GLOBAL bool Conf_PAM; GLOBAL bool Conf_PAM;

10
src/ngircd/conn.c
View File

@ -1487,7 +1487,7 @@ Conn_StartLogin(CONN_ID Idx)
ident_sock = My_Connections[Idx].sock; ident_sock = My_Connections[Idx].sock;
#endif #endif
if (Conf_NoticeAuth) { if (Conf_NoticeBeforeRegistration) {
/* Send "NOTICE *" messages to the client */ /* Send "NOTICE *" messages to the client */
#ifdef IDENTAUTH #ifdef IDENTAUTH
if (Conf_Ident) if (Conf_Ident)
@ -2265,7 +2265,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
strlcpy(My_Connections[i].host, readbuf, strlcpy(My_Connections[i].host, readbuf,
sizeof(My_Connections[i].host)); sizeof(My_Connections[i].host));
Client_SetHostname(c, readbuf); Client_SetHostname(c, readbuf);
if (Conf_NoticeAuth) if (Conf_NoticeBeforeRegistration)
(void)Conn_WriteStr(i, (void)Conn_WriteStr(i,
"NOTICE * :*** Found your hostname: %s", "NOTICE * :*** Found your hostname: %s",
My_Connections[i].host); My_Connections[i].host);
@ -2291,7 +2291,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
i, identptr); i, identptr);
Client_SetUser(c, identptr, true); Client_SetUser(c, identptr, true);
} }
if (Conf_NoticeAuth) { if (Conf_NoticeBeforeRegistration) {
(void)Conn_WriteStr(i, (void)Conn_WriteStr(i,
"NOTICE * :*** Got %sident response%s%s", "NOTICE * :*** Got %sident response%s%s",
*ptr ? "invalid " : "", *ptr ? "invalid " : "",
@ -2300,13 +2300,13 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
} }
} else if(Conf_Ident) { } else if(Conf_Ident) {
Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i); Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
if (Conf_NoticeAuth) if (Conf_NoticeBeforeRegistration)
(void)Conn_WriteStr(i, (void)Conn_WriteStr(i,
"NOTICE * :*** No ident response"); "NOTICE * :*** No ident response");
} }
#endif #endif
if (Conf_NoticeAuth) { if (Conf_NoticeBeforeRegistration) {
/* Send buffered data to the client, but break on /* Send buffered data to the client, but break on
* errors because Handle_Write() would have closed * errors because Handle_Write() would have closed
* the connection again in this case! */ * the connection again in this case! */