Use "NOTICE *" before registration instead of "NOTICE AUTH".

AUTH is a valid nickname so sending notices to it is probably not
a good idea. Use * as the target instead as done with numerics
when the nick is not available.

This mimics the behaviour in Charybdis, IRCD-Hybrid, InspIRCd 2.2,
Plexus 4, etc.

diff --git a/doc/sample-ngircd.conf.tmpl b/doc/sample-ngircd.conf.tmpl
index b5db1d9e1edffa5af2070dfc27bf9fa990590ce6..c39df5943e31a0995e5848cef8278007c75e27a2 100644 (file)
--- a/doc/sample-ngircd.conf.tmpl
+++ b/doc/sample-ngircd.conf.tmpl
@@ -193,7 +193,7 @@
        ;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
 

diff --git a/man/ngircd.conf.5.tmpl b/man/ngircd.conf.5.tmpl
index 9040043d9db8003ce997d9851454c223badf3f7d..7996c62806a760a39de4e9514046029644b4b67b 100644 (file)
--- a/man/ngircd.conf.5.tmpl
+++ b/man/ngircd.conf.5.tmpl
@@ -301,7 +301,7 @@ Default: no.
 .TP
 \fBNoticeAuth\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.h b/src/ngircd/conf.h
index aa80b8dd94942536c29ff4fce85c18e316e591ce..0d5c56695c8f896c4e442bb96e76759dc118c2d3 100644 (file)
--- a/src/ngircd/conf.h
+++ b/src/ngircd/conf.h
@@ -194,7 +194,7 @@ GLOBAL bool Conf_Ident;
 /** Enable "more privacy" mode and "censor" some user-related information */
 GLOBAL bool Conf_MorePrivacy;
 
-/** Enable NOTICE AUTH messages on connect */
+/** Enable "NOTICE *" messages on connect */
 GLOBAL bool Conf_NoticeAuth;
 
 /** Enable all usage of PAM, even when compiled with support for it */

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 62561544866413f5abb1534da27caac1e2aa2218..daf496b4186a58d3f43ba8c22339918a318e05e1 100644 (file)
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1488,15 +1488,15 @@ Conn_StartLogin(CONN_ID Idx)
 #endif
 
        if (Conf_NoticeAuth) {
-               /* Send "NOTICE AUTH" messages to the client */
+               /* 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! */
@@ -2267,7 +2267,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
                Client_SetHostname(c, readbuf);
                if (Conf_NoticeAuth)
                        (void)Conn_WriteStr(i,
-                                       "NOTICE AUTH :*** Found your hostname: %s",
+                                       "NOTICE * :*** Found your hostname: %s",
                                        My_Connections[i].host);
 #ifdef IDENTAUTH
                ++identptr;
@@ -2293,7 +2293,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
                        }
                        if (Conf_NoticeAuth) {
                                (void)Conn_WriteStr(i,
-                                       "NOTICE AUTH :*** Got %sident response%s%s",
+                                       "NOTICE * :*** Got %sident response%s%s",
                                        *ptr ? "invalid " : "",
                                        *ptr ? "" : ": ",
                                        *ptr ? "" : identptr);
@@ -2302,7 +2302,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
                        Log(LOG_INFO, "IDENT lookup for connection %d: no result.", i);
                        if (Conf_NoticeAuth)
                                (void)Conn_WriteStr(i,
-                                       "NOTICE AUTH :*** No ident response");
+                                       "NOTICE * :*** No ident response");
                }
 #endif