mirrors/ngircd
1
0
Fork 0
mirror of https://github.com/osmarks/ngircd.git synced 2025-01-19 12:02:52 +00:00
Code Issues Releases Wiki Activity

Streamline handling of invalid and unset server name

Browse Source 
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.
This commit is contained in:
Alexander Barton 2019-06-29 16:02:52 +02:00
parent 13122bc97d
commit f8002057f2
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ngircd/conf.c
View File

@ -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! */

2
src/ngircd/sighandlers.c
View File

@ -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;