s/case_ignore_normalize/caseIgnoreIA5Normalize/

s/case_ignore_compare/caseIgnoreIA5Match/
s/case_exact_normalize/caseExactIA5Normalize/
s/case_exact_compare/caseExactIA5Match/

to make room for UTF-8 and T.61 varients.

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 0a638ac904b3acdd114688ab86089078677b1af9..8e19bb2d88effa91f0d64c8fb6954d4538455817 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -449,7 +449,9 @@ LIBSLAPD_F (Syntax *) syn_find_desc LDAP_P((const char *syndesc, int *slen));
 LIBSLAPD_F (int) syn_add LDAP_P((LDAP_SYNTAX *syn, slap_syntax_check_func *check, const char **err));
 LIBSLAPD_F (MatchingRule *) mr_find LDAP_P((const char *mrname));
 LIBSLAPD_F (int) mr_add LDAP_P((LDAP_MATCHING_RULE *mr, slap_mr_normalize_func *normalize, slap_mr_compare_func *compare, const char **err));
-LIBSLAPD_F (int) case_ignore_normalize LDAP_P((struct berval *val, struct berval **normalized));
+
+LIBSLAPD_F (int) caseIngoreIA5Normalize LDAP_P((struct berval *val, struct berval **normalized));
+
 LIBSLAPD_F (int) register_syntax LDAP_P((char *desc,   slap_syntax_check_func *check ));
 LIBSLAPD_F (int) register_matching_rule LDAP_P((char * desc,   slap_mr_normalize_func *normalize, slap_mr_compare_func *compare));
 LIBSLAPD_F (void) schema_info LDAP_P((Connection *conn, Operation *op, char **attrs, int attrsonly));

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index f5e32c07b48657ec8855f0f748b9a45f5b2edffb..375638d39401dd89532982bb7e2af2b3b8e8b745 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -786,7 +786,7 @@ mr_add(
 }
 
 static int
-case_exact_normalize(
+caseExactIA5Normalize(
        struct berval *val,
        struct berval **normalized
 )
@@ -824,7 +824,7 @@ case_exact_normalize(
 }
 
 static int
-case_exact_compare(
+caseExactIA5Match(
        struct berval *val1,
        struct berval *val2
 )
@@ -833,7 +833,7 @@ case_exact_compare(
 }
 
 int
-case_ignore_normalize(
+caseIgnoreIA5Normalize(
        struct berval *val,
        struct berval **normalized
 )
@@ -871,7 +871,7 @@ case_ignore_normalize(
 }
 
 static int
-case_ignore_compare(
+caseIgnoreIA5Match(
        struct berval *val1,
        struct berval *val2
 )
@@ -1016,18 +1016,18 @@ struct mrule_defs_rec mrule_defs[] = {
        {"( 2.5.13.0 NAME 'objectIdentifierMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )", NULL, NULL},
        {"( 2.5.13.1 NAME 'distinguishedNameMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )", NULL, NULL},
        {"( 2.5.13.2 NAME 'caseIgnoreMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-        case_ignore_normalize, case_ignore_compare},
+        caseIgnoreIA5Normalize, caseIgnoreIA5Match},
        {"( 2.5.13.3 NAME 'caseIgnoreOrderingMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-        case_ignore_normalize, case_ignore_compare},
+        caseIgnoreIA5Normalize, caseIgnoreIA5Match},
        {"( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-        case_ignore_normalize, case_ignore_compare},
+        caseIgnoreIA5Normalize, caseIgnoreIA5Match},
        /* Next three are not in the RFC's, but are needed for compatibility */
        {"( 2.5.13.5 NAME 'caseExactMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-        case_exact_normalize, case_exact_compare},
+        caseExactIA5Normalize, caseExactIA5Match},
        {"( 2.5.13.6 NAME 'caseExactOrderingMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
-        case_exact_normalize, case_exact_compare},
+        caseExactIA5Normalize, caseExactIA5Match},
        {"( 2.5.13.7 NAME 'caseExactSubstringsMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )",
-        case_exact_normalize, case_exact_compare},
+        caseExactIA5Normalize, caseExactIA5Match},
        {"( 2.5.13.8 NAME 'numericStringMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )", NULL, NULL},
        {"( 2.5.13.10 NAME 'numericStringSubstringsMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", NULL, NULL},
        {"( 2.5.13.11 NAME 'caseIgnoreListMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )", NULL, NULL},
@@ -1044,9 +1044,9 @@ struct mrule_defs_rec mrule_defs[] = {
        {"( 2.5.13.29 NAME 'integerFirstComponentMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )", NULL, NULL},
        {"( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )", NULL, NULL},
        {"( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
-        case_exact_normalize, case_exact_compare},
+        caseExactIA5Normalize, caseExactIA5Match},
        {"( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match' SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )",
-        case_ignore_normalize, case_ignore_compare},
+        caseIgnoreIA5Normalize, caseIgnoreIA5Match},
        {NULL, NULL, NULL}
 };
 
@@ -1072,9 +1072,9 @@ schema_init( void )
        for ( i=0; mrule_defs[i].mrd_desc != NULL; i++ ) {
                res = register_matching_rule( mrule_defs[i].mrd_desc,
                    ( mrule_defs[i].mrd_normalize ?
-                     mrule_defs[i].mrd_normalize : case_ignore_normalize ),
+                     mrule_defs[i].mrd_normalize : caseIgnoreIA5Normalize ),
                    ( mrule_defs[i].mrd_compare ?
-                     mrule_defs[i].mrd_compare : case_ignore_compare ) );
+                     mrule_defs[i].mrd_compare : caseIgnoreIA5Match ) );
                if ( res ) {
                        fprintf( stderr, "schema_init: Error registering matching rule %s\n",
                                 mrule_defs[i].mrd_desc );