ITS#5650

diff --git a/CHANGES b/CHANGES
index 890a57db73abf8d7d2a7cfc2b0e28406914c7cfa..29ceb27f3cb3051a12a001d1cf8a4125bef46416 100644 (file)
--- 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 15da6c76594732a4529d224aea5afc529d75f8d1..76ad30ce3bf9a90cd92195bd2112674068df8d6a 100644 (file)
--- 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 */