From 320ec10a24d8dd81d0aa011dc92e07877e4e02f8 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Sun, 20 Jun 2004 19:54:37 +0000
Subject: Removing code which looked at current dir for config file before
 attempting to read system one.

---
 bgpd/bgp_main.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'bgpd')

diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 54086e5b..a4cd9ab4 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)
-- 
cgit v1.2.1