From f4fb769522ae0b9ee6a0f712ffc1f0a1822d7633 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 10 Jul 2008 01:39:51 +0000
Subject: [PATCH] ITS#5583

---
 CHANGES                          |  1 +
 servers/slapd/overlays/dynlist.c | 32 ++++++++++++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGES b/CHANGES
index d48f50dcfa..b32f694647 100644
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,7 @@ OpenLDAP 2.4.11 Engineering
 	Fixed slapd sets memory leak (ITS#5557)
 	Fixed slapd-meta link to slapd-ldap (ITS#5355)
 	Fixed slapd-sock, back-shell buffer count (ITS#5558)
+	Fixed slapo-dynlist dg attrs lookup (ITS#5583)
 	Added slapo-nssov contrib module
 	Fixed slapo-pcache handling of negative search caches (ITS#5546)
 	Fixed slapo-ppolicy DNs with whitespaces (ITS#5552)
diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index ba9a9d2ac5..2cbf53e79f 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -1557,22 +1557,26 @@ dynlist_db_open(
 		}
 	}
 
-	rc = slap_str2ad( "dgIdentity", &ad_dgIdentity, &text );
-	if ( rc != LDAP_SUCCESS ) {
-		snprintf( cr->msg, sizeof( cr->msg),
-			"unable to fetch attributeDescription \"dgIdentity\": %d (%s)",
-			rc, text );
-		Debug( LDAP_DEBUG_ANY, "dynlist_db_open: %s\n", cr->msg, 0, 0 );
-		/* Just a warning */
+	if ( ad_dgIdentity == NULL ) {
+		rc = slap_str2ad( "dgIdentity", &ad_dgIdentity, &text );
+		if ( rc != LDAP_SUCCESS ) {
+			snprintf( cr->msg, sizeof( cr->msg),
+				"unable to fetch attributeDescription \"dgIdentity\": %d (%s)",
+				rc, text );
+			Debug( LDAP_DEBUG_ANY, "dynlist_db_open: %s\n", cr->msg, 0, 0 );
+			/* Just a warning */
+		}
 	}
 
-	rc = slap_str2ad( "dgAuthz", &ad_dgAuthz, &text );
-	if ( rc != LDAP_SUCCESS ) {
-		snprintf( cr->msg, sizeof( cr->msg),
-			"unable to fetch attributeDescription \"dgAuthz\": %d (%s)",
-			rc, text );
-		Debug( LDAP_DEBUG_ANY, "dynlist_db_open: %s\n", cr->msg, 0, 0 );
-		/* Just a warning */
+	if ( ad_dgAuthz == NULL ) {
+		rc = slap_str2ad( "dgAuthz", &ad_dgAuthz, &text );
+		if ( rc != LDAP_SUCCESS ) {
+			snprintf( cr->msg, sizeof( cr->msg),
+				"unable to fetch attributeDescription \"dgAuthz\": %d (%s)",
+				rc, text );
+			Debug( LDAP_DEBUG_ANY, "dynlist_db_open: %s\n", cr->msg, 0, 0 );
+			/* Just a warning */
+		}
 	}
 
 	return 0;
-- 
2.39.5