From: hasso <hasso>
Date: Tue, 12 Oct 2004 06:13:54 +0000 (+0000)
Subject: Unbreak ospfclient compilation.
X-Git-Tag: frr-2.0-rc1~3472
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f4d58ce5aa0da64fd136c5747ff371d46736490a;p=mirror%2Ffrr.git

Unbreak ospfclient compilation.
---

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 86cbe59283..f90a933e96 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-12 Hasso Tepper <hasso at quagga.net>
+
+	* ospf_main.c, ospf_opaque.c: Unbreak ospfclient compilation - move
+	  static variable from ospf_main.c into ospf_opaque.c.
+
 2004-10-11 Hasso Tepper <hasso at quagga.net>
 
 	* ospf_main.c, ospf_opaque.c: Disable ospfapi init by default. New
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index a7e56dcd43..7e4d45d3cd 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -100,8 +100,7 @@ struct thread_master *master;
 /* Process ID saved for use by init system */
 const char *pid_file = PATH_OSPFD_PID;
 
-/* OSPF apiserver is disabled by default. */
-int ospf_apiserver_enable = 0;
+extern int ospf_apiserver_enable;
 
 /* Help information display. */
 static void
@@ -205,6 +204,9 @@ main (int argc, char **argv)
   /* OSPF master init. */
   ospf_master_init ();
 
+  /* OSPF apiserver is disabled by default. */
+  ospf_apiserver_enable = 0;
+
   while (1) 
     {
       int opt;
diff --git a/ospfd/ospf_opaque.c b/ospfd/ospf_opaque.c
index d0d1be3d5a..8563b85a79 100644
--- a/ospfd/ospf_opaque.c
+++ b/ospfd/ospf_opaque.c
@@ -69,7 +69,8 @@
 #ifdef SUPPORT_OSPF_API
 int ospf_apiserver_init (void);
 void ospf_apiserver_term (void); 
-extern int ospf_apiserver_enable;
+/* Init apiserver? It's disabled by default. */
+int ospf_apiserver_enable;
 #endif /* SUPPORT_OSPF_API */
 
 static void ospf_opaque_register_vty (void);