2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>

	* watchquagga.c: Use new config.h define for DAEMON_VTY_DIR.

diff --git a/watchquagga/ChangeLog b/watchquagga/ChangeLog
index 91541221a8e3b8a31f4617376a7751ecd62a781a..cc9ac2277a2afa3f71ab63e9e3e0d1defe52229a 100644 (file)
--- a/watchquagga/ChangeLog
+++ b/watchquagga/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
+
+       * watchquagga.c: Use new config.h define for DAEMON_VTY_DIR.
+
 2004-12-22 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
        * watchquagga.c: Get PATH_WATCHQUAGGA_PID from config.h.

diff --git a/watchquagga/watchquagga.c b/watchquagga/watchquagga.c
index 194b807a5feee9ec3d2dde411a1683f168065a21..e16b9c25c026be5c7c6bcc48c62ba1229bfe321d 100644 (file)
--- a/watchquagga/watchquagga.c
+++ b/watchquagga/watchquagga.c
@@ -1,5 +1,5 @@
 /*
-    $Id: watchquagga.c,v 1.2 2004/12/22 14:08:13 ajs Exp $
+    $Id: watchquagga.c,v 1.3 2004/12/22 15:37:44 ajs Exp $
 
     Monitor status of quagga daemons and restart if necessary.
 
@@ -63,6 +63,11 @@
 #else
 #define DEFAULT_PIDFILE                STATEDIR "/watchquagga.pid"
 #endif
+#ifdef DAEMON_VTY_DIR
+#define VTYDIR                 DAEMON_VTY_DIR
+#else
+#define VTYDIR                 STATEDIR
+#endif
 
 #define PING_TOKEN     "PING"
 
@@ -142,7 +147,7 @@ static struct global_state {
 } gs = {
   .mode = MODE_MONITOR,
   .phase = PHASE_NONE,
-  .vtydir = STATEDIR,
+  .vtydir = VTYDIR,
   .period = 1000*DEFAULT_PERIOD,
   .timeout = DEFAULT_TIMEOUT,
   .restart_timeout = DEFAULT_RESTART_TIMEOUT,
@@ -323,7 +328,7 @@ Options:\n\
 -h, --help     Display this help and exit\n\
 ", progname,mode_str[0],progname,mode_str[1],progname,mode_str[2],
 progname,mode_str[3],progname,mode_str[4],progname,mode_str[2],mode_str[3],
-STATEDIR,DEFAULT_LOGLEVEL,LOG_EMERG,LOG_DEBUG,LOG_DEBUG,
+VTYDIR,DEFAULT_LOGLEVEL,LOG_EMERG,LOG_DEBUG,LOG_DEBUG,
 DEFAULT_MIN_RESTART,DEFAULT_MAX_RESTART,
 DEFAULT_PERIOD,DEFAULT_TIMEOUT,DEFAULT_RESTART_TIMEOUT,DEFAULT_PIDFILE);