Use defined Root DSE attributes.

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 4f2b993532f3999d6a5d47f9afca1a46737968f0..8196988daf7214ca0265932b1635e48001f929ff 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -124,7 +124,7 @@ do_compare(
                goto cleanup;
        }
 
-       if( ndn == '\0' ) {
+       if( *ndn == '\0' ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
                           "do_compare: conn %d  compare to root DSE!\n",
@@ -192,15 +192,15 @@ do_compare(
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
                   "do_compare: conn %d  dn (%s) attr(%s) value (%s)\n",
-                  conn->c_connid, dn, ava.aa_desc->ad_cname->bv_val,
+                  conn->c_connid, dn, ava.aa_desc->ad_cname.bv_val,
                   ava.aa_value->bv_val ));
 #else
        Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
-           dn, ava.aa_desc->ad_cname->bv_val, ava.aa_value->bv_val );
+           dn, ava.aa_desc->ad_cname.bv_val, ava.aa_value->bv_val );
 #endif
 
        Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n",
-           op->o_connid, op->o_opid, dn, ava.aa_desc->ad_cname->bv_val, 0 );
+           op->o_connid, op->o_opid, dn, ava.aa_desc->ad_cname.bv_val, 0 );
 
 
        /* deref suffix alias if appropriate */
@@ -218,9 +218,6 @@ cleanup:
        free( ndn );
        free( desc.bv_val );
        free( value.bv_val );
-       if( ava.aa_desc != NULL ) {
-               ad_free( ava.aa_desc, 1 );
-       }
 
        return rc;
 }