From: Vincent Bernat <bernat@luffy.cx>
Date: Tue, 22 Jan 2013 08:49:52 +0000 (+0100)
Subject: lldpd: pause only if lldpcli has not been disabled
X-Git-Tag: 0.7.2~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba529c82f338ec45b6c070a45c84949910d8779c;p=thirdparty%2Flldpd.git

lldpd: pause only if lldpcli has not been disabled
---

diff --git a/src/daemon/lldpd.c b/src/daemon/lldpd.c
index 025c8f44..30f80c54 100644
--- a/src/daemon/lldpd.c
+++ b/src/daemon/lldpd.c
@@ -1031,7 +1031,7 @@ lldpd_configure(int debug, const char *path)
 				"resume",
 				NULL) == -1) {
 				log_warn("main", "unable to execute %s", path);
-				log_warnx("main", "configuration may be incomplete");
+				log_warnx("main", "configuration is incomplete, lldpd needs to be unpaused");
 			}
 		}
 		exit(127);
@@ -1389,7 +1389,8 @@ lldpd_main(int argc, char *argv[])
 	cfg->g_config.c_cid_pattern = cidp;
 	cfg->g_config.c_iface_pattern = interfaces;
 	cfg->g_config.c_smart = smart;
-	cfg->g_config.c_paused = 1;
+	if (lldpcli)
+		cfg->g_config.c_paused = 1;
 	cfg->g_config.c_receiveonly = receiveonly;
 	cfg->g_config.c_tx_interval = LLDPD_TX_INTERVAL;
 #ifdef USE_SNMP