summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Tkac <atkac@redhat.com>2010-12-20 11:52:54 +0100
committerAdam Tkac <atkac@redhat.com>2010-12-20 11:52:54 +0100
commita0a60a6bd59845c6f6aac65d5398c1e6c8b3b2a6 (patch)
tree4b00d78dc9158d95adcf6d20d8aebcb394aea10e
parent3afaba74d966f3c3fdc7c533db28b0c9458276d7 (diff)
downloadbind-a0a60a6bd59845c6f6aac65d5398c1e6c8b3b2a6.tar.gz
bind-a0a60a6bd59845c6f6aac65d5398c1e6c8b3b2a6.tar.xz
bind-a0a60a6bd59845c6f6aac65d5398c1e6c8b3b2a6.zip
Fix "krb5-self" update-policy rule processing.
Signed-off-by: Adam Tkac <atkac@redhat.com>
-rw-r--r--bind.spec7
-rw-r--r--bind97-krb5-self.patch12
2 files changed, 18 insertions, 1 deletions
diff --git a/bind.spec b/bind.spec
index de467c2..bf53e29 100644
--- a/bind.spec
+++ b/bind.spec
@@ -22,7 +22,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind
License: ISC
Version: 9.7.2
-Release: 8.%{PATCHVER}%{?dist}
+Release: 9.%{PATCHVER}%{?dist}
Epoch: 32
Url: http://www.isc.org/products/BIND/
Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,7 @@ Patch109:bind97-rh478718.patch
Patch110:bind97-rh570851.patch
Patch111:bind97-exportlib.patch
Patch112:bind97-rh645544.patch
+Patch113:bind97-krb5-self.patch
# SDB patches
Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -296,6 +297,7 @@ mkdir m4
%patch110 -p1 -b .rh570851
%patch111 -p1 -b .exportlib
%patch112 -p1 -b .rh645544
+%patch113 -p1 -b .krb5-self
# Sparc and s390 arches need to use -fPIE
%ifarch sparcv9 sparc64 s390 s390x
@@ -764,6 +766,9 @@ rm -rf ${RPM_BUILD_ROOT}
%endif
%changelog
+* Mon Dec 20 2010 Adam Tkac <atkac redhat com> 32:9.7.2-9.P3
+- fix "krb5-self" update-policy rule processing
+
* Thu Dec 02 2010 Adam Tkac <atkac redhat com> 32:9.7.2-8.P3
- update to 9.7.2-P3
diff --git a/bind97-krb5-self.patch b/bind97-krb5-self.patch
new file mode 100644
index 0000000..e8ce845
--- /dev/null
+++ b/bind97-krb5-self.patch
@@ -0,0 +1,12 @@
+diff -up bind-9.7.2-P3/lib/dns/gssapictx.c.krb5-self bind-9.7.2-P3/lib/dns/gssapictx.c
+--- bind-9.7.2-P3/lib/dns/gssapictx.c.krb5-self 2010-12-20 11:18:36.459176676 +0100
++++ bind-9.7.2-P3/lib/dns/gssapictx.c 2010-12-20 11:18:42.263376643 +0100
+@@ -358,7 +358,7 @@ dst_gssapi_identitymatchesrealmkrb5(dns_
+ if (rname == NULL)
+ return (isc_boolean_false);
+ *rname = '\0';
+- rname += 2;
++ rname++;
+
+ /*
+ * Find the host portion of the signer's name. We do this by