summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul@quagga.net>2011-03-23 10:38:45 +0000
committerPaul Jakma <paul@quagga.net>2011-03-23 10:38:45 +0000
commitdb07ad7358cb5e26358326332629ffb658f5747a (patch)
treec8663d225fddb5ce7f6bfaef7b1cdc797932cca4
parent3bde17f1af635c9ca19df0b3516cb8ad0376e6d3 (diff)
parentfc95186c30884c96543aecfc56cfe5b08774525b (diff)
Merge branch 'master' of ssh://code.quagga.net/var/git/quagga
-rw-r--r--lib/command.c2
-rw-r--r--lib/if.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/command.c b/lib/command.c
index 5a13f39c..264e0f7b 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -3056,7 +3056,7 @@ DEFUN (config_logmsg,
if ((level = level_match(argv[0])) == ZLOG_DISABLED)
return CMD_ERR_NO_MATCH;
- zlog(NULL, level, ((message = argv_concat(argv, argc, 1)) ? message : ""));
+ zlog(NULL, level, "%s", ((message = argv_concat(argv, argc, 1)) ? message : ""));
if (message)
XFREE(MTYPE_TMP, message);
return CMD_SUCCESS;
diff --git a/lib/if.c b/lib/if.c
index b61bdbff..86f754b6 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -664,7 +664,7 @@ connected_log (struct connected *connected, char *str)
strncat (logbuf, inet_ntop (p->family, &p->u.prefix, buf, BUFSIZ),
BUFSIZ - strlen(logbuf));
}
- zlog (NULL, LOG_INFO, logbuf);
+ zlog (NULL, LOG_INFO, "%s", logbuf);
}
/* If two connected address has same prefix return 1. */