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 /ripd | |
| parent | 6c0f9a782a7be49de53b5ae00980990d96edbf03 (diff) | |
Removing code which looked at current dir for config file before attempting
to read system one.
Diffstat (limited to 'ripd')
| -rw-r--r-- | ripd/rip_main.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ripd/rip_main.c b/ripd/rip_main.c index 530b13c9..c2128e46 100644 --- a/ripd/rip_main.c +++ b/ripd/rip_main.c @@ -74,7 +74,6 @@ struct zebra_privs_t ripd_privs = }; /* Configuration file and directory. */ -char config_current[] = RIPD_DEFAULT_CONFIG; char config_default[] = SYSCONFDIR RIPD_DEFAULT_CONFIG; char *config_file = NULL; @@ -131,7 +130,7 @@ sighup (void) zlog_info ("ripd restarting!"); /* Reload config file. */ - vty_read_config (config_file, config_current, config_default); + vty_read_config (config_file, config_default); /* Create VTY's socket */ vty_serv_sock (vty_addr, vty_port, RIP_VTYSH_PATH); @@ -274,7 +273,7 @@ main (int argc, char **argv) sort_node (); /* Get configuration file. */ - vty_read_config (config_file, config_current, config_default); + vty_read_config (config_file, config_default); /* Change to the daemon program. */ if (daemon_mode) |