SLAPD_SCHEMA_NOT_COMPAT: working ACLs! (have not tested ACIs)

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index e89f9716b9cc0fd5ef4176c11231cec044141188..e01b2beaa8b1571d3194ac6630c9bfff4e2d23f4 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -458,6 +458,9 @@ acl_mask(
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
                        int match;
                        const char *text;
+                       const char *desc = b->a_dn_at->ad_cname->bv_val;
+#else
+                       const char *desc = b->a_dn_at;
 #endif
 
                        Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
@@ -482,7 +485,7 @@ acl_mask(
                        if( match ) {
                                if ( b->a_dn_self && (val == NULL
                                        || value_match( &match, b->a_dn_at,
-                                               b->a_dn_at->ad_type->sat_equality, &bv, val, &text ) )
+                                               b->a_dn_at->ad_type->sat_equality, val, &bv, &text ) )
                                                != LDAP_SUCCESS
                                        || match )
                                {
@@ -490,7 +493,7 @@ acl_mask(
                                }
                        } else if ( ! b->a_dn_self || val == NULL
                                || value_match( &match, b->a_dn_at,
-                                       b->a_dn_at->ad_type->sat_equality, &bv, val, &text )
+                                       b->a_dn_at->ad_type->sat_equality, val, &bv, &text )
                                        != LDAP_SUCCESS
                                || match )
                        {