Unbreak ospfclient compilation.

diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 86cbe59283f17a7dd8051e267ca07c7e5f41befa..f90a933e96456638a51e4035275470cc3005edf4 100644 (file)
--- 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 a7e56dcd43927b4e58b67410f14bd54ee7446de6..7e4d45d3cd45bd022181c19c020df2a196e91c99 100644 (file)
--- 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 d0d1be3d5a263bf8c1456896391835f303795d99..8563b85a798c9443df95630a9d456fe838abccb3 100644 (file)
--- 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);