From: Alexander Barton <alex@barton.de>
Date: Tue, 18 Jan 2011 21:01:27 +0000 (+0100)
Subject: Don't read MOTD file twice
X-Git-Tag: rel-18-rc1~75
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=914d6a26d85ecaf7e0962c40392769cf4764e987

Don't read MOTD file twice

The MOTD file is read in Read_Config(), so don't read it when handling
the "MotdFile" configuration variable. Instead make sure that it is
initialized properly when (re-)reading the configuration.
---

diff --git a/src/ngircd/conf.c b/src/ngircd/conf.c
index 32846faa..fa22df05 100644
--- a/src/ngircd/conf.c
+++ b/src/ngircd/conf.c
@@ -641,6 +641,9 @@ Set_Defaults(bool InitServers)
 		for (i = 0; i < MAX_SERVERS;
 		     Init_Server_Struct(&Conf_Server[i++]));
 	}
+
+	/* Free MOTD; this is important when reloading the configuration */
+	array_free(&Conf_Motd);
 } /* Set_Defaults */
 
 
@@ -1016,7 +1019,6 @@ Handle_GLOBAL( int Line, char *Var, char *Arg )
 		len = strlcpy( Conf_MotdFile, Arg, sizeof( Conf_MotdFile ));
 		if (len >= sizeof( Conf_MotdFile ))
 			Config_Error_TooLong( Line, Var );
-		Read_Motd(Arg);
 		return;
 	}
 	if( strcasecmp( Var, "MotdPhrase" ) == 0 ) {