group rewrite/map stuff in one structure and optimize more function calls

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index d758e1cebbba4494768df674c343b31a4b446a3f..9a3ee2526eba440cb6387b50a25fa692ba7b8de0 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -90,11 +90,7 @@ objectSubClassMatch(
                return SLAPD_COMPARE_UNDEFINED;
        }
 
-#ifdef SLAP_NVALUES
        if( SLAP_MR_IS_VALUE_OF_ATTRIBUTE_SYNTAX( flags ) )
-#else
-       if( SLAP_IS_MR_ATTRIBUTE_SYNTAX_MATCH( flags ) )
-#endif
        {
                *matchp = ( asserted != oc );
        } else {
@@ -473,7 +469,7 @@ static struct slap_schema_ad_map {
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
                NULL, SLAP_AT_HIDE,
                NULL, NULL, NULL, NULL, NULL,
-               offsetof(struct slap_internal_schema, si_ad_entryCSN) },
+               offsetof(struct slap_internal_schema, si_ad_namingCSN) },
 
        { "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "   
                        "DESC 'LCUP/LDUP: UUID of the superior entry' "
@@ -828,9 +824,8 @@ static struct slap_schema_mr_map {
                offsetof(struct slap_internal_schema, si_mr_distinguishedNameMatch) },
        { "integerMatch",
                offsetof(struct slap_internal_schema, si_mr_integerMatch) },
-       { "integerFirstComponentMatch",
-               offsetof(struct slap_internal_schema,
-                       si_mr_integerFirstComponentMatch) },
+       { "integerFirstComponentMatch", offsetof(struct slap_internal_schema,
+               si_mr_integerFirstComponentMatch) },
        { NULL, 0 }
 };