diff options
| author | hasso <hasso> | 2004-06-20 19:54:37 +0000 |
|---|---|---|
| committer | hasso <hasso> | 2004-06-20 19:54:37 +0000 |
| commit | 320ec10a24d8dd81d0aa011dc92e07877e4e02f8 (patch) | |
| tree | 867cc29d5981b58bad9392cb7eb471daeb8250a1 /isisd | |
| parent | 6c0f9a782a7be49de53b5ae00980990d96edbf03 (diff) | |
Removing code which looked at current dir for config file before attempting
to read system one.
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/isis_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/isisd/isis_main.c b/isisd/isis_main.c index e763a9e8..a2a7e51a 100644 --- a/isisd/isis_main.c +++ b/isisd/isis_main.c @@ -87,7 +87,6 @@ struct option longopts[] = }; /* Configuration file and directory. */ -char config_current[] = ISISD_DEFAULT_CONFIG; char config_default[] = SYSCONFDIR ISISD_DEFAULT_CONFIG; char *config_file = NULL; @@ -311,9 +310,9 @@ main (int argc, char **argv, char **envp) /* parse config file */ /* this is needed three times! because we have interfaces before the areas */ - vty_read_config (config_file, config_current, config_default); - vty_read_config (config_file, config_current, config_default); - vty_read_config (config_file, config_current, config_default); + vty_read_config (config_file, config_default); + vty_read_config (config_file, config_default); + vty_read_config (config_file, config_default); /* demonize */ if (daemon_mode) |