Fix minor problems with proceeding commit which broken old schema compat

diff --git a/servers/slapd/back-ldbm/attr.c b/servers/slapd/back-ldbm/attr.c
index 72f26d31dc9e77bda95855142ee8e8faee7f73cf..3414941c546f8afd1d0f091ab2d6caa65f50aad8 100644 (file)
--- a/servers/slapd/back-ldbm/attr.c
+++ b/servers/slapd/back-ldbm/attr.c
@@ -105,9 +105,7 @@ attr_index_config(
        for ( i = 0; attrs[i] != NULL; i++ ) {
                a = (AttrInfo *) ch_malloc( sizeof(AttrInfo) );
                a->ai_type = ch_strdup( attrs[i] );
-#ifdef SLAPD_SCHEMA_COMPAT
-               a->ai_syntaxmask = attr_syntax( a->ai_type );
-#endif
+
                if ( argc == 1 ) {
                        a->ai_indexmask = (
                                SLAP_INDEX_PRESENCE | SLAP_INDEX_EQUALITY |

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 18faa0ea39be6bb6aaa40a7206c4783f0f32c4dc..6c07a050a4affed39285872767d8a7abf25119a3 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -715,10 +715,17 @@ struct slap_backend_info {
        /* Auxilary Functions */
        int     (*bi_entry_release_rw) LDAP_P((BackendDB *bd, Entry *e, int rw));
 
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
        int     (*bi_acl_group)  LDAP_P((Backend *bd,
                Entry *e, const char *bdn, const char *edn,
                const char *objectclassValue,
                AttributeType *group_at ));
+#else
+       int     (*bi_acl_group)  LDAP_P((Backend *bd,
+               Entry *e, const char *bdn, const char *edn,
+               const char *objectclassValue,
+               const char *group_at ));
+#endif
 
        int     (*bi_connection_init) LDAP_P((BackendDB *bd,
                struct slap_conn *c));