From: Alexander Barton <alex@barton.de>
Date: Sun, 21 Jan 2024 18:58:01 +0000 (+0100)
Subject: Don't show the default config file name on config errors
X-Git-Tag: rel-27-rc1~56
X-Git-Url: https://arthur.barton.de/gitweb/?p=ngircd-alex.git;a=commitdiff_plain;h=47d3872c607febc4ad56c24fa559828f96b6a208

Don't show the default config file name on config errors

The configuration can be set in drop-in files in the include directory,
too, so it is not clear in which file it is actually missing.
---

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index eaa5e932..b87979c3 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -2129,8 +2129,7 @@ Validate_Config(bool Configtest, bool Rehash)
 	if (!Conf_ServerName[0] || !strchr(Conf_ServerName, '.')) {
 		config_valid = false;
 		Config_Error(LOG_ALERT,
-			     "No (valid) server name configured in \"%s\" (section 'Global': 'Name')!",
-			     NGIRCd_ConfFile);
+			     "No (valid) server name configured (section 'Global': 'Name')!");
 		if (!Configtest && !Rehash) {
 			Config_Error(LOG_ALERT,
 				     "%s exiting due to fatal errors!",
@@ -2144,8 +2143,7 @@ Validate_Config(bool Configtest, bool Rehash)
 		/* No administrative contact configured! */
 		config_valid = false;
 		Config_Error(LOG_ALERT,
-			     "No administrator email address configured in \"%s\" ('AdminEMail')!",
-			     NGIRCd_ConfFile);
+			     "No administrator email address configured ('AdminEMail')!");
 		if (!Configtest) {
 			Config_Error(LOG_ALERT,
 				     "%s exiting due to fatal errors!",