"NoticeAuth" configuration variable is deprecated now!

diff --git a/INSTALL b/INSTALL
index fa73bd7172a6aa7d60f5401d36dff25f32efc0ee..098f6e537c7287488de37e54423bc5635fb17896 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,6 +14,10 @@ I. Upgrade Information
 
 Differences to version 22.x
 
+- The "NoticeAuth" ngircd.conf configuration variable has been renamed to
+  "NoticeBeforeRegistration". The old "NoticeAuth" variable still works but
+  is deprecated now.
+
 - The default value of the SSL "CipherList" variable has been changed to
   "HIGH:!aNULL:@STRENGTH:!SSLv3" (OpenSSL) and "SECURE128:-VERS-SSL3.0"
   (GnuTLS) to disable the old SSLv3 protocol by default.

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 5f8bce5ddbad35586588454a9d9813a7cd63cbbc..62b5044c87be0daa7569846c6d07d42f1bf67417 100644 (file)
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -1796,7 +1796,19 @@ Handle_OPTIONS(const char *File, int Line, char *Var, char *Arg)
                Conf_MorePrivacy = Check_ArgIsTrue(Arg);
                return;
        }
-       if (strcasecmp(Var, "NoticeBeforeRegistration") == 0 || strcasecmp(Var, "NoticeAuth") == 0) {
+       if (strcasecmp(Var, "NoticeAuth") == 0) {
+               /*
+                * TODO: This section and support for "NoticeAuth" variable
+                * could be removed starting with ngIRCd release 24 (one
+                * release after marking it "deprecated") ...
+                */
+               Config_Error(LOG_WARNING,
+                            "%s, line %d (section \"Options\"): \"%s\" is deprecated, please use \"NoticeBeforeRegistration\"!",
+                            File, Line, Var);
+               Conf_NoticeBeforeRegistration = Check_ArgIsTrue(Arg);
+               return;
+       }
+       if (strcasecmp(Var, "NoticeBeforeRegistration") == 0) {
                Conf_NoticeBeforeRegistration = Check_ArgIsTrue(Arg);
                return;
        }