From 5a22ec6422edb0e08c20333aae393ce1804fefb1 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Wed, 16 May 2012 11:43:00 -0400
Subject: [PATCH] * Wed May 16 2012 Paul Wouters <pwouters@redhat.com> -
 1.4.0-0.a1.3 - Patch for crasher with deleted RRsets and NSEC3/OPTOUT chains

---
 opendnssec-1.4.0a1-deleterr.patch | 12 ++++++++++++
 opendnssec.spec                   |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 opendnssec-1.4.0a1-deleterr.patch

diff --git a/opendnssec-1.4.0a1-deleterr.patch b/opendnssec-1.4.0a1-deleterr.patch
new file mode 100644
index 0000000..1f39ec5
--- /dev/null
+++ b/opendnssec-1.4.0a1-deleterr.patch
@@ -0,0 +1,12 @@
+diff -Naur opendnssec-1.4.0a1-orig/signer/src/signer/namedb.c opendnssec-1.4.0a1/signer/src/signer/namedb.c
+--- opendnssec-1.4.0a1-orig/signer/src/signer/namedb.c	2012-03-15 13:25:45.000000000 -0400
++++ opendnssec-1.4.0a1/signer/src/signer/namedb.c	2012-05-16 11:32:52.123793809 -0400
+@@ -834,7 +834,7 @@
+     if (!denial || !db || !db->denials) {
+         return NULL;
+     }
+-    if (denial->rrset->rr_count) {
++    if (denial->rrset && denial->rrset->rr_count) {
+         ods_log_error("[%s] unable to delete denial: denial in use [#%u]",
+             db_str, denial->rrset->rr_count);
+         log_dname(denial->dname, "ERR -DENIAL", LOG_ERR);
diff --git a/opendnssec.spec b/opendnssec.spec
index 6ff71c9..bfadb39 100644
--- a/opendnssec.spec
+++ b/opendnssec.spec
@@ -1,7 +1,7 @@
 Summary: DNSSEC key and zone management software
 Name: opendnssec
 Version: 1.4.0
-Release: 0.a1%{?dist}.2
+Release: 0.a1%{?dist}.3
 License: BSD
 Url: http://www.opendnssec.org/
 #Source: http://www.opendnssec.org/files/source/% {name}-% {version}a1.tar.gz
@@ -12,6 +12,7 @@ Source3: ods.sysconfig
 Source4: conf.xml
 Source5: tmpfiles-opendnssec.conf
 Source6: opendnssec-LICENSE
+Patch1: opendnssec-1.4.0a1-deleterr.patch
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: opencryptoki, softhsm, systemd-units
@@ -30,6 +31,7 @@ name server. It requires a PKCS#11 crypto module library, such as softhsm
 
 %prep
 %setup -q -n %{name}-%{version}a1
+%patch1 -p1 -b deleterr
 
 %build
 %configure --with-ldns=%{_libdir}
@@ -118,6 +120,9 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Wed May 16 2012 Paul Wouters <pwouters@redhat.com> - 1.4.0-0.a1.3
+- Patch for crasher with deleted RRsets and NSEC3/OPTOUT chains
+
 * Mon Mar 26 2012 Paul Wouters <pwouters@redhat.com> - 1.4.0-0.a1.2
 - Added opendnssec LICENSE file from trunk (Thanks Jakob!)