commit db07ad7358cb5e26358326332629ffb658f5747a
author Paul Jakma <paul@quagga.net> Wed Mar 23 10:38:45 2011 +0000
committer Paul Jakma <paul@quagga.net> Wed Mar 23 10:38:45 2011 +0000
tree c8663d225fddb5ce7f6bfaef7b1cdc797932cca4
parent 3bde17f1af635c9ca19df0b3516cb8ad0376e6d3
parent fc95186c30884c96543aecfc56cfe5b08774525b

Merge branch 'master' of ssh://code.quagga.net/var/git/quagga

lib/command.c

diff --git a/lib/command.c b/lib/command.c
index 5a13f39..264e0f7 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -3056,7 +3056,7 @@
   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;

lib/if.c

diff --git a/lib/if.c b/lib/if.c
index b61bdbf..86f754b 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -664,7 +664,7 @@
       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. */