schema checks

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index fdf17a74df50bed42c40697019afc58f31bb3339..177cd21b6dbaf1c58eed17757d383d10ccbac975 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -80,7 +80,8 @@ ldap_back_compare(
                return -1;
        }
 
-       if ( op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_objectClass ) {
+       if ( op->orc_ava->aa_desc == slap_schema.si_ad_objectClass
+               || op->orc_ava->a_desc == slap_schema.si_ad_structuralObjectClass ) {
                ldap_back_map(&li->rwmap.rwm_oc, &op->orc_ava->aa_value,
                                &mapped_val, BACKLDAP_MAP);
                if (mapped_val.bv_val == NULL || mapped_val.bv_val[0] == '\0') {

diff --git a/servers/slapd/back-ldap/map.c b/servers/slapd/back-ldap/map.c
index 094ac9b846b09d89f10e5494965ff269af6bd9f8..be02636c369df5ed0fc16e232a62ea8864541e9b 100644 (file)
--- a/servers/slapd/back-ldap/map.c
+++ b/servers/slapd/back-ldap/map.c
@@ -188,7 +188,7 @@ map_attr_value(
                return 0;
        }
 
-       if ( strcmp( ad->ad_type->sat_syntax->ssyn_oid, SLAPD_DN_SYNTAX ) == 0 )
+       if ( ad->ad_type->sat_syntax == slap_schema.si_syn_distinguishedName )
        {
                dncookie fdc = *dc;
 

diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index bf3100e82cb528def1fba63b93c229df86477575..81b1debc3302f04b3e7530a0cb69c3bb2a098dcd 100644 (file)
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -146,9 +146,9 @@ ldap_back_dn_massage(
                        strncpy( res->bv_val, dn->bv_val, diff );
                        strcpy( &res->bv_val[diff], dc->rwmap->rwm_suffix_massage[i+dst].bv_val );
 #ifdef NEW_LOGGING
-                                       LDAP_LOG ( BACK_LDAP, ARGS, 
-                                               "ldap_back_dn_massage: converted \"%s\" to \"%s\"\n",
-                                               dn->bv_val, res->bv_val, 0 );
+                       LDAP_LOG ( BACK_LDAP, ARGS, 
+                               "ldap_back_dn_massage: converted \"%s\" to \"%s\"\n",
+                               dn->bv_val, res->bv_val, 0 );
 #else
                        Debug( LDAP_DEBUG_ARGS,
                                "ldap_back_dn_massage:"