Commit Diff
Diff:
13122bc97d13c2630ab4b25a621486d0b7a0d134
f8002057f20e71f24b52c3aab5df3dc1760a151e
f8002057f20e71f24b52c3aab5df3dc1760a151e
Commit:
f8002057f20e71f24b52c3aab5df3dc1760a151e
Tree:
595c77e2c94e9662efcf82fd99b76f3a10249a1d
Committer:
Alexander Barton <alex@barton.de>
Date:
Sat Jun 29 14:02:52 2019
UTC
Message:
Streamline handling of invalid and unset server name
Don't exit during runtime (REHASH command, HUP signal), because the
server name can't be changed in this case anyway and the new invalid
name will be ignored.
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -2234,7 +2234,8 @@ Validate_Config(bool Configtest, bool Rehash)
break;
} while (*(++ptr));
- if (!Conf_ServerName[0]) {
+ if (!Conf_ServerName[0] || !strchr(Conf_ServerName, '.'))
+ {
/* No server name configured! */
config_valid = false;
Config_Error(LOG_ALERT,
@@ -2248,20 +2249,6 @@ Validate_Config(bool Configtest, bool Rehash)
}
}
- if (Conf_ServerName[0] && !strchr(Conf_ServerName, '.')) {
- /* No dot in server name! */
- config_valid = false;
- Config_Error(LOG_ALERT,
- "Invalid server name configured in \"%s\" (section 'Global': 'Name'): Dot missing!",
- NGIRCd_ConfFile);
- if (!Configtest) {
- Config_Error(LOG_ALERT,
- "%s exiting due to fatal errors!",
- PACKAGE_NAME);
- exit(1);
- }
- }
-
#ifdef STRICT_RFC
if (!Conf_ServerAdminMail[0]) {
/* No administrative contact configured! */
--- src/ngircd/sighandlers.c
+++ src/ngircd/sighandlers.c
@@ -119,7 +119,7 @@ Rehash(void)
if (strcmp(old_name, Conf_ServerName) != 0 ) {
strlcpy(Conf_ServerName, old_name, sizeof Conf_ServerName);
Log(LOG_ERR,
- "Can't change \"ServerName\" on runtime! Ignored new name.");
+ "Can't change server name (\"Name\") on runtime! Ignored new name.");
}
if (old_nicklen != Conf_MaxNickLength) {
Conf_MaxNickLength = old_nicklen;