minor fixes

[openldap] / servers / slapd / back-ldap / compare.c

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index c3c76bc1ab0d99ead758ce099ce2aa6a529f0bfa..dd496b035229516c0e68472aaa4ac21cacc5c3f7 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -57,7 +57,8 @@ ldap_back_compare(
 {
        struct ldapinfo *li = (struct ldapinfo *) be->be_private;
        struct ldapconn *lc;
-       char *mdn, *mapped_oc, *mapped_at;
+       struct berval mapped_oc, mapped_at;
+       struct berval mdn = { 0, NULL };
 
        lc = ldap_back_getconn(li, conn, op);
        if (!lc || !ldap_back_dobind( lc, op ) ) {
@@ -68,18 +69,18 @@ ldap_back_compare(
         * Rewrite the compare dn, if needed
         */
 #ifdef ENABLE_REWRITE
-       switch ( rewrite_session( li->rwinfo, "compareDn", dn->bv_val, conn, &mdn ) ) {
+       switch ( rewrite_session( li->rwinfo, "compareDn", dn->bv_val, conn, &mdn.bv_val ) ) {
        case REWRITE_REGEXEC_OK:
-               if ( mdn == NULL ) {
-                       mdn = ( char * )dn->bv_val;
+               if ( mdn.bv_val == NULL ) {
+                       mdn.bv_val = ( char * )dn->bv_val;
                }
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
                                "[rw] compareDn: \"%s\" -> \"%s\"\n",
-                               dn->bv_val, mdn ));
+                               dn->bv_val, mdn.bv_val ));
 #else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_ARGS, "rw> compareDn: \"%s\" -> \"%s\"\n%s",
-                               dn->bv_val, mdn, "" );
+                               dn->bv_val, mdn.bv_val, "" );
 #endif /* !NEW_LOGGING */
                break;
                
@@ -94,29 +95,25 @@ ldap_back_compare(
                return( -1 );
        }
 #else /* !ENABLE_REWRITE */
-       mdn = ldap_back_dn_massage( li, ch_strdup( dn->bv_val ), 0 );
-       if ( mdn == NULL ) {
+       ldap_back_dn_massage( li, dn, &mdn, 0, 1 );
+       if ( mdn.bv_val == NULL ) {
                return -1;
        }
 #endif /* !ENABLE_REWRITE */
 
-       mapped_oc = ldap_back_map(&li->oc_map, ava->aa_desc->ad_cname.bv_val, 0);
-       if (mapped_oc == NULL)
+       ldap_back_map(&li->oc_map, &ava->aa_desc->ad_cname, &mapped_oc, 0);
+       if (mapped_oc.bv_val == NULL)
                return( -1 );
 
-       mapped_at = ldap_back_map(&li->at_map, ava->aa_value->bv_val, 0);
-       if (mapped_at == NULL)
+       ldap_back_map(&li->at_map, &ava->aa_value, &mapped_at, 0);
+       if (mapped_at.bv_val == NULL)
                return( -1 );
 
-       ldap_compare_s( lc->ld, mdn, mapped_oc, mapped_at );
+       ldap_compare_s( lc->ld, mdn.bv_val, mapped_oc.bv_val, mapped_at.bv_val );
 
-#ifdef ENABLE_REWRITE
-       if ( mdn != dn->bv_val ) {
-#endif /* ENABLE_REWRITE */
-               free( mdn );
-#ifdef ENABLE_REWRITE
+       if ( mdn.bv_val != dn->bv_val ) {
+               free( mdn.bv_val );
        }
-#endif /* ENABLE_REWRITE */
        
        return( ldap_back_op_result( lc, op ) );
 }