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

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

Use "NOTICE *" before registration instead of "NOTICE AUTH".
This commit is contained in:
Alexander Barton 2015-08-01 14:51:04 +02:00
parent b72a7a4b96 5545e1bebf
commit 64c265cf33
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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?

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

@ -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)

8
src/ngircd/conf.c
View File

@ -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) {

4
src/ngircd/conf.h
View File

@ -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;

22
src/ngircd/conn.c
View File

@ -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! */