summaryrefslogtreecommitdiffstats
path: root/bgpd
diff options
context:
space:
mode:
authorhasso <hasso>2004-06-20 21:54:37 +0200
committerhasso <hasso>2004-06-20 21:54:37 +0200
commit320ec10a24d8dd81d0aa011dc92e07877e4e02f8 (patch)
tree867cc29d5981b58bad9392cb7eb471daeb8250a1 /bgpd
parentZebra daemon has access lists. (diff)
downloadfrr-320ec10a24d8dd81d0aa011dc92e07877e4e02f8.tar.xz
frr-320ec10a24d8dd81d0aa011dc92e07877e4e02f8.zip
Removing code which looked at current dir for config file before attempting
to read system one.
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 54086e5b2..a4cd9ab48 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -79,7 +79,6 @@ struct quagga_signal_t bgp_signals[] =
};
/* Configuration file and directory. */
-char config_current[] = BGP_DEFAULT_CONFIG;
char config_default[] = SYSCONFDIR BGP_DEFAULT_CONFIG;
/* Route retain mode flag. */
@@ -159,7 +158,7 @@ sighup (void)
zlog_info ("bgpd 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, BGP_VTYSH_PATH);
@@ -287,7 +286,7 @@ main (int argc, char **argv)
sort_node ();
/* Parse config file. */
- vty_read_config (config_file, config_current, config_default);
+ vty_read_config (config_file, config_default);
/* Turn into daemon if daemon_mode is set. */
if (daemon_mode)