diff options
| author | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-11-27 19:14:30 +0000 |
|---|---|---|
| committer | petere <petere@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2011-11-27 19:14:30 +0000 |
| commit | e532e0999d2e51421a2981ae40dd2b55cc417a34 (patch) | |
| tree | 2824657109583a9c2c804e357ea2dbff8d48581c | |
| parent | eca5d548869181a2313521d24f6b391cebd2b651 (diff) | |
| download | ntp-e532e0999d2e51421a2981ae40dd2b55cc417a34.tar.gz | |
Refreshed format-security.patch
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@339 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
| -rw-r--r-- | debian/patches/format-security.patch | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/debian/patches/format-security.patch b/debian/patches/format-security.patch index 3175db6..c777aa5 100644 --- a/debian/patches/format-security.patch +++ b/debian/patches/format-security.patch @@ -6,11 +6,9 @@ Description: Fix build failures with -Werror=format-security Author: Colin Watson <cjwatson@ubuntu.com> Last-Update: 2011-05-20 -Index: b/lib/isc/unix/ifiter_ioctl.c -=================================================================== --- a/lib/isc/unix/ifiter_ioctl.c +++ b/lib/isc/unix/ifiter_ioctl.c -@@ -159,7 +159,7 @@ +@@ -159,7 +159,7 @@ getbuf4(isc_interfaceiter_t *iter) { break; } if (iter->bufsize >= IFCONF_BUFSIZE_MAX) { @@ -19,7 +17,7 @@ Index: b/lib/isc/unix/ifiter_ioctl.c isc_msgcat_get(isc_msgcat, ISC_MSGSET_IFITERIOCTL, ISC_MSG_BUFFERMAX, -@@ -260,7 +260,7 @@ +@@ -260,7 +260,7 @@ getbuf6(isc_interfaceiter_t *iter) { break; } if (iter->bufsize6 >= IFCONF_BUFSIZE_MAX) { @@ -28,11 +26,9 @@ Index: b/lib/isc/unix/ifiter_ioctl.c isc_msgcat_get(isc_msgcat, ISC_MSGSET_IFITERIOCTL, ISC_MSG_BUFFERMAX, -Index: b/ntpd/ntp_config.c -=================================================================== --- a/ntpd/ntp_config.c +++ b/ntpd/ntp_config.c -@@ -2324,7 +2324,7 @@ +@@ -2326,7 +2326,7 @@ config_access( if ((RES_MSSNTP & flags) && !warned_signd) { warned_signd = 1; fprintf(stderr, "%s\n", signd_warning); @@ -41,11 +37,9 @@ Index: b/ntpd/ntp_config.c } } } -Index: b/ntpd/ntp_control.c -=================================================================== --- a/ntpd/ntp_control.c +++ b/ntpd/ntp_control.c -@@ -2948,7 +2948,7 @@ +@@ -2948,7 +2948,7 @@ report_event( " %s", str); } NLOG(NLOG_SYSEVENT) @@ -54,7 +48,7 @@ Index: b/ntpd/ntp_control.c } else { /* -@@ -2980,7 +2980,7 @@ +@@ -2980,7 +2980,7 @@ report_event( " %s", str); } NLOG(NLOG_PEEREVENT) @@ -63,11 +57,9 @@ Index: b/ntpd/ntp_control.c } record_proto_stats(statstr); #if DEBUG -Index: b/ntpd/ntpd.c -=================================================================== --- a/ntpd/ntpd.c +++ b/ntpd/ntpd.c -@@ -1283,7 +1283,7 @@ +@@ -1284,7 +1284,7 @@ library_fatal_error(const char *file, in msyslog(LOG_ERR, "%s:%d: fatal error:", file, line); vsnprintf(errbuf, sizeof(errbuf), format, args); @@ -76,7 +68,7 @@ Index: b/ntpd/ntpd.c msyslog(LOG_ERR, "exiting (due to fatal error in library)"); abort(); -@@ -1305,7 +1305,7 @@ +@@ -1306,7 +1306,7 @@ library_unexpected_error(const char *fil msyslog(LOG_ERR, "%s:%d: unexpected error:", file, line); vsnprintf(errbuf, sizeof(errbuf), format, args); |