ITS#5583

diff --git a/CHANGES b/CHANGES
index d48f50dcfa605a86a3be3c731959862ae73e0d5f..b32f694647771d023a14a0e50107d7b0f199a39c 100644 (file)
--- 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 ba9a9d2ac51772064c4a027733d09169e0e0ddb9..2cbf53e79fa648e5913ef8cdd1413bbd8bf8432e 100644 (file)
--- 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;