welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Set hostname /after/ having read the config file.

Browse source 
Signed-off-by: Benjamin Cama <benoar@dolka.fr>
This commit is contained in:
Benjamin Cama 2011-09-19 18:10:03 +02:00
parent bf41bf2eac
commit 0b06de8105
3 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
l2tpns.c
View file

@ -4294,14 +4294,9 @@ static void initdata(int optdebug, char *optconfig)
if (!*hostname)
{
if (!*config->hostname)
{
// Grab my hostname unless it's been specified
gethostname(hostname, sizeof(hostname));
stripdomain(hostname);
}
else
strcpy(hostname, config->hostname);
// Grab my hostname unless it's been specified
gethostname(hostname, sizeof(hostname));
stripdomain(hostname);
}
_statistics->start_time = _statistics->last_reset = time(NULL);
@ -4716,8 +4711,12 @@ int main(int argc, char *argv[])
initplugins();
initdata(optdebug, optconfig);
init_cli(hostname);
init_cli();
read_config_file();
/* set hostname /after/ having read the config file */
if (*config->hostname)
strcpy(hostname, config->hostname);
cli_init_hostname(hostname);
update_config();
init_tbf(config->num_tbfs);