Use defined Root DSE attributes.

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 5d1f4c205c3a9f4b6e42af53283ced8e707d3ce2..0248a659aca0330a079ad52cb70ec6e898fe3625 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -810,7 +810,7 @@ send_search_entry(
 
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
                AttributeDescription *desc = a->a_desc;
-               char *type = desc->ad_cname->bv_val;
+               char *type = desc->ad_cname.bv_val;
 
                if ( attrs == NULL ) {
                        /* all addrs request, skip operational attributes */
@@ -836,10 +836,10 @@ send_search_entry(
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
                                   "send_search_entry: conn %d  access to attribute %s not allowed\n",
-                                  op->o_connid, desc->ad_cname->bv_val ));
+                                  op->o_connid, desc->ad_cname.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
-                           desc->ad_cname->bv_val, 0, 0 );
+                           desc->ad_cname.bv_val, 0, 0 );
 #endif
 
                        continue;
@@ -868,11 +868,11 @@ send_search_entry(
 #ifdef NEW_LOGGING
                                        LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
                                                   "send_search_entry: conn %d  access to attribute %s, value %d not allowed\n",
-                                                  op->o_connid, desc->ad_cname->bv_val, i ));
+                                                  op->o_connid, desc->ad_cname.bv_val, i ));
 #else
                                        Debug( LDAP_DEBUG_ACL,
                                                "acl: access to attribute %s, value %d not allowed\n",
-                                       desc->ad_cname->bv_val, i, 0 );
+                                       desc->ad_cname.bv_val, i, 0 );
 #endif
 
                                        continue;
@@ -943,16 +943,16 @@ send_search_entry(
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
                                   "send_search_entry: conn %s  access to attribute %s not allowed\n",
-                                  op->o_connid, desc->ad_cname->bv_val ));
+                                  op->o_connid, desc->ad_cname.bv_val ));
 #else
                        Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
-                           desc->ad_cname->bv_val, 0, 0 );
+                           desc->ad_cname.bv_val, 0, 0 );
 #endif
 
                        continue;
                }
 
-               rc = ber_printf( ber, "{s[" /*]}*/ , desc->ad_cname->bv_val );
+               rc = ber_printf( ber, "{s[" /*]}*/ , desc->ad_cname.bv_val );
                if ( rc == -1 ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -965,6 +965,7 @@ send_search_entry(
                        ber_free( ber, 1 );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encoding description error", NULL, NULL );
+                       attrs_free( aa );
                        goto error_return;
                }
 
@@ -976,11 +977,11 @@ send_search_entry(
 #ifdef NEW_LOGGING
                                        LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
                                                   "send_search_entry: conn %d access to %s, value %d not allowed\n",
-                                                  op->o_connid, desc->ad_cname->bv_val, i ));
+                                                  op->o_connid, desc->ad_cname.bv_val, i ));
 #else
                                        Debug( LDAP_DEBUG_ACL,
                                                "acl: access to attribute %s, value %d not allowed\n",
-                                       desc->ad_cname->bv_val, i, 0 );
+                                       desc->ad_cname.bv_val, i, 0 );
 #endif
 
                                        continue;
@@ -1000,6 +1001,7 @@ send_search_entry(
                                        ber_free( ber, 1 );
                                        send_ldap_result( conn, op, LDAP_OTHER,
                                                NULL, "encoding values error", NULL, NULL );
+                                       attrs_free( aa );
                                        goto error_return;
                                }
                        }
@@ -1017,6 +1019,7 @@ send_search_entry(
                        ber_free( ber, 1 );
                        send_ldap_result( conn, op, LDAP_OTHER,
                            NULL, "encode end error", NULL, NULL );
+                       attrs_free( aa );
                        goto error_return;
                }
        }