summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <adam.tkac@geodis.cz>2013-04-19 12:21:30 +0200
committerAdam Tkac <adam.tkac@geodis.cz>2013-04-19 12:21:30 +0200
commit7731d63afbb82518c676ab8da70a09a616b7a9ea (patch)
treefe278bda5d9fcb38731a64b8266856f75bee36fe
parent4ebe3dc7ef12fc49e299057539bab34b5d499395 (diff)
downloadbind-7731d63afbb82518c676ab8da70a09a616b7a9ea.tar.gz
bind-7731d63afbb82518c676ab8da70a09a616b7a9ea.tar.xz
bind-7731d63afbb82518c676ab8da70a09a616b7a9ea.zip
Fix crash in nsupdate when processing "-r" parameter (#949544)
Signed-off-by: Adam Tkac <adam.tkac@geodis.cz>
-rw-r--r--bind.spec7
-rw-r--r--bind99-opts.patch12
2 files changed, 18 insertions, 1 deletions
diff --git a/bind.spec b/bind.spec
index f482824..eac9a27 100644
--- a/bind.spec
+++ b/bind.spec
@@ -26,7 +26,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.9.3
-Release: 0.2.%{PREVER}%{?dist}
+Release: 0.3.%{PREVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,6 +81,7 @@ Patch133:bind99-rh640538.patch
Patch134:bind97-rh669163.patch
Patch136:rl-9.9.3rc1.patch
Patch137:bind99-rrl.patch
+Patch138:bind99-opts.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -315,6 +316,7 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
%patch133 -p1 -b .rh640538
%patch134 -p1 -b .rh669163
%patch135 -p1 -b .libidn4
+%patch138 -p1 -b .opts
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -776,6 +778,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Fri Apr 19 2013 Adam Tkac <atkac redhat com> 32:9.9.3-0.3.rc1
+- fix crash in nsupdate when processing "-r" parameter (#949544)
+
* Tue Apr 16 2013 Adam Tkac <atkac redhat com> 32:9.9.3-0.2.rc1
- ship dns/rrl.h in -devel subpkg
diff --git a/bind99-opts.patch b/bind99-opts.patch
new file mode 100644
index 0000000..f82fe83
--- /dev/null
+++ b/bind99-opts.patch
@@ -0,0 +1,12 @@
+diff -up bind-9.9.3rc1/bin/nsupdate/nsupdate.c.opts bind-9.9.3rc1/bin/nsupdate/nsupdate.c
+--- bind-9.9.3rc1/bin/nsupdate/nsupdate.c.opts 2013-04-19 12:13:41.930729267 +0200
++++ bind-9.9.3rc1/bin/nsupdate/nsupdate.c 2013-04-19 12:14:49.962531190 +0200
+@@ -934,7 +934,7 @@ get_address(char *host, in_port_t port,
+ INSIST(count == 1);
+ }
+
+-#define PARSE_ARGS_FMT "dDML:y:ghlovk:p:rR::t:u:"
++#define PARSE_ARGS_FMT "dDML:y:ghlovk:p:r:R:t:u:"
+
+ static void
+ pre_parse_args(int argc, char **argv) {