import fix to ITS#3005

diff --git a/CHANGES b/CHANGES
index 32b39132a63feb3729bb8927eb9bbe67530a0ee0..7a371a4d8aea9df09b851cd2455a264d03d9cbfa 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.2.7 Engineering
        Fixed search abandon handling in backglue (ITS#2999)
        Fixed massaged base free in back-ldap (ITS#2999)
        Fixed (undocumented) AD canonical DN (ITS#3000)
+       Fixed undefined attribute name request in back-sql search (ITS#3005)
 
 OpenLDAP 2.2.6 Release
        Fixed slapd SASL callback handling (ITS#2926)

diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c
index e1cf863cd1218f3862d7dbac399ee77cbe8b186e..d70169a2a5fddff75ce250aead88fe1058eba453 100644 (file)
--- a/servers/slapd/back-sql/entry-id.c
+++ b/servers/slapd/back-sql/entry-id.c
@@ -396,7 +396,7 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid )
                        }
 
                        rc = backsql_supad2at( bsi->bsi_oc, attr->an_desc, &vat );
-                       if ( rc != 0 ) {
+                       if ( rc != 0 || vat == NULL ) {
                                Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): "
                                                "attribute '%s' is not defined "
                                                "for objectlass '%s'\n",