From 85dc4d87770f821b777f5dbf6372956dbffc770c Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sat, 1 Aug 2015 14:43:38 +0200 Subject: [PATCH] "NoticeAuth" configuration variable is deprecated now! --- INSTALL | 4 ++++ src/ngircd/conf.c | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index fa73bd71..098f6e53 100644 --- 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 5f8bce5d..62b5044c 100644 --- 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; } -- 2.39.2