From feb5ac94d8d7622ecd6f6e0e1094272070d15f98 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 3 Sep 2008 02:54:37 +0000
Subject: [PATCH] ITS#5650

---
 CHANGES                           | 1 +
 servers/slapd/back-bdb/id2entry.c | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGES b/CHANGES
index 890a57db73..29ceb27f3c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.12 Engineering
 	Fixed slapd overlay control registration (ITS#5649)
 	Fixed slapd socket closing on Windows (ITS#5606)
 	Fixed slapd syncrepl error logging (ITS#5618)
+	Fixed slapd-bdb entry return if attr not present (ITS#5650)
 	Fixed slapd-ldap,slapd-meta invalid filter behavior (ITS#5614)
 	Fixed slapd-meta quarantine behavior (ITS#5592)
 	Fixed slapd-meta objectClass filtering (ITS#5647)
diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 15da6c7659..76ad30ce3b 100644
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -401,6 +401,15 @@ dn2entry_retry:
 		goto return_results;
 	}
 
+	/* NOTE: attr_find() or attrs_find()? */
+	if ( at && attr_find( e->e_attrs, at ) == NULL ) {
+		Debug( LDAP_DEBUG_ACL,
+			"<= bdb_entry_get: failed to find attribute %s\n",
+			at->ad_cname.bv_val, 0, 0 ); 
+		rc = LDAP_NO_SUCH_ATTRIBUTE;
+		goto return_results;
+	}
+
 return_results:
 	if( rc != LDAP_SUCCESS ) {
 		/* free entry */
-- 
2.39.5