summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetwroks.com>2016-08-19 18:18:35 +0200
committerDonald Sharp <sharpd@cumulusnetwroks.com>2016-08-19 18:18:35 +0200
commit810a8dfc93f4cb64323c89872dbb8f4323e5aa57 (patch)
treea0a069a303325b0d55a6c2c1aad33efe01ae78e5 /pimd
parentzebra: Fix up cherry-pick mistake (diff)
parentbgpd: Upon interface up (update) only kick-off non-Established peers (diff)
downloadfrr-810a8dfc93f4cb64323c89872dbb8f4323e5aa57.tar.xz
frr-810a8dfc93f4cb64323c89872dbb8f4323e5aa57.zip
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index b28b3d624..b65b925fa 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -138,7 +138,9 @@ int main(int argc, char** argv, char** envp) {
zlog_default = openzlog(progname, ZLOG_PIM, 0,
LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
zprivs_init (&pimd_privs);
- zlog_set_file (NULL, LOG_DEFAULT_FILENAME, zlog_default->default_lvl);
+#if defined(HAVE_CUMULUS)
+ zlog_set_level (NULL, ZLOG_DEST_SYSLOG, zlog_default->default_lvl);
+#endif
/* this while just reads the options */
while (1) {