summaryrefslogtreecommitdiff
path: root/package/quagga/quagga-zlog.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-04-01 15:51:29 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-04-01 21:25:32 +0200
commit6bbd5367a59b9b98b48e06c3b489476834cfb220 (patch)
treeb0b749c5f851e074f1a5e5f28d92d37d3a6b1443 /package/quagga/quagga-zlog.patch
parent887d210986da45191dcb14647b93fea20b5ddb3e (diff)
quagga: security bump to version 0.99.18
Fixes for vulnerabilities CVE-2010-1674 and CVE-2010-1675. Additional patches for build-time breakage of the new version. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/quagga/quagga-zlog.patch')
-rw-r--r--package/quagga/quagga-zlog.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/package/quagga/quagga-zlog.patch b/package/quagga/quagga-zlog.patch
new file mode 100644
index 000000000..ad75bfef6
--- /dev/null
+++ b/package/quagga/quagga-zlog.patch
@@ -0,0 +1,43 @@
+From fc95186c30884c96543aecfc56cfe5b08774525b Mon Sep 17 00:00:00 2001
+From: Christian Hammers <ch@debian.org>
+Date: Wed, 23 Mar 2011 13:07:55 +0300
+Subject: [PATCH] lib: fix more format warnings (#637)
+
+The following patch was also neccessary to compile.
+
+* command.c: (config_logmsg_cmd) use "%s" format spec
+* if.c: (connected_log) ditto
+---
+ lib/command.c | 2 +-
+ lib/if.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+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 @@ 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 b61bdbf..86f754b 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. */
+--
+1.7.4
+