diff options
| author | Alexander Barton <alex@barton.de> | 2011-01-18 22:01:27 +0100 |
|---|---|---|
| committer | Alexander Barton <alex@barton.de> | 2011-01-18 22:01:27 +0100 |
| commit | 914d6a26d85ecaf7e0962c40392769cf4764e987 (patch) | |
| tree | da469eed1709f29193728841dc513e9f89cbf5a1 /src | |
| parent | c98e794b38684d39d51a964e5b1670908be01691 (diff) | |
| download | ngircd-914d6a26d85ecaf7e0962c40392769cf4764e987.tar.gz ngircd-914d6a26d85ecaf7e0962c40392769cf4764e987.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngircd/conf.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 ) { |