Commit Diff

Commit:
914d6a26d85ecaf7e0962c40392769cf4764e987
From:
Alexander Barton <alex@barton.de>
Date:
Message:
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.
Actions:
Patch | Tree
commit - c98e794b38684d39d51a964e5b1670908be01691
commit + 914d6a26d85ecaf7e0962c40392769cf4764e987
blob - 32846faa052002f068b41cf628ebc15d71bfb60a
blob + fa22df051c3addaa9ab029bd44dbad3197c65b89
--- src/ngircd/conf.c
+++ 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 ) {