Commit Diff
Diff:
b72a7a4b96df11859dd5f5d7112d9d1409a9f0e5
64c265cf33d09cfb9ab5e7d0bbc8033dc85f7c64
Commit:
64c265cf33d09cfb9ab5e7d0bbc8033dc85f7c64
Tree:
fe0fc510a70f3a135a077e5c961dffbf05c0c046
Author:
Alexander Barton <alex@barton.de>
Committer:
Alexander Barton <alex@barton.de>
Date:
Sat Aug 1 12:51:04 2015 UTC
Message:
Merge pull request #217 from SaberUK/master+notice-auth Use "NOTICE *" before registration instead of "NOTICE AUTH".
blob - b5db1d9e1edffa5af2070dfc27bf9fa990590ce6
blob + a4346b1e87488935551807d535fd1a6e548e08f7
--- doc/sample-ngircd.conf.tmpl
+++ 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?
blob - 9040043d9db8003ce997d9851454c223badf3f7d
blob + 8c62709cdf2758802f5febf5901ab9c8d30d16ab
--- man/ngircd.conf.5.tmpl
+++ man/ngircd.conf.5.tmpl
@@ -299,9 +299,9 @@ 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 AUTH" messages to clients
+Enable this option to let the daemon send "NOTICE *" messages to clients
while connecting. Default: no.
.TP
\fBOperCanUseMode\fR (boolean)
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 - aa80b8dd94942536c29ff4fce85c18e316e591ce
blob + 70de20af9edbb6321b739eac123124baa74e5575
--- src/ngircd/conf.h
+++ 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;
blob - 62561544866413f5abb1534da27caac1e2aa2218
blob + 6b3b51eaf5c10dc6b8555d8a99b53dee3b178a79
--- src/ngircd/conn.c
+++ 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! */
IRCNow