From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 16 Dec 2009 20:09:37 +0000 (+0000)
Subject: ITS#6403
X-Git-Tag: OPENLDAP_REL_ENG_2_4_21~1
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9792d5640e7be8a62ef28bf1de9f4db7c0591593;p=openldap

ITS#6403
---

diff --git a/CHANGES b/CHANGES
index 95aec9ce12..78881d80a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.21 Engineering
 	Fixed slapd-config Adds with Abstract classes (ITS#6408)
 	Fixed slapo-dynlist behavior with simple filters (ITS#6421)
 	Fixed slapd-ldif access outside database directory (ITS#6414)
+	Fixed slapd-null extraneous assert (ITS#6403)
 	Fixed slapo-translucent with back-null (ITS#6403)
 	Fixed slapo-unique criteria checking (ITS#6270)
 	Build Environment
diff --git a/servers/slapd/back-null/null.c b/servers/slapd/back-null/null.c
index eb4f3c71c9..ae92e38610 100644
--- a/servers/slapd/back-null/null.c
+++ b/servers/slapd/back-null/null.c
@@ -234,8 +234,6 @@ null_back_entry_get(
 	int rw,
 	Entry **ent )
 {
-	assert( *ent == NULL );
-
 	/* don't admit the object isn't there */
 	return oc || at ? LDAP_NO_SUCH_ATTRIBUTE : LDAP_BUSY;
 }