From ba529c82f338ec45b6c070a45c84949910d8779c Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Tue, 22 Jan 2013 09:49:52 +0100 Subject: [PATCH] lldpd: pause only if lldpcli has not been disabled --- src/daemon/lldpd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 -- 2.39.5