1
0
mirror of https://github.com/osmarks/ngircd.git synced 2024-10-28 04:46:17 +00:00

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.
This commit is contained in:
Alexander Barton 2011-01-18 22:01:27 +01:00
parent c98e794b38
commit 914d6a26d8

View File

@ -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 ) {