From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 6 Mar 2004 16:02:43 +0000 (+0000)
Subject: import fix to ITS#3005
X-Git-Tag: OPENLDAP_REL_ENG_2_2_7~39
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=09ffe9f8776b131b98b492a475c2117f16fdda41;p=openldap

import fix to ITS#3005
---

diff --git a/CHANGES b/CHANGES
index 32b39132a6..7a371a4d8a 100644
--- 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 e1cf863cd1..d70169a2a5 100644
--- 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",