add new ber dump routine (behind NEW_LOGGING)

[openldap] / servers / slapd / schema_prep.c

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 1bd2f942f4ec156b5f7fddc05899e27e7c58d369..b62d8b216826ba22962aa442486ca1db031d5bc5 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -15,6 +15,7 @@
 
 #include "slap.h"
 #include "ldap_pvt.h"
+#include "ldap_pvt_uc.h"
 
 int schema_init_done = 0;
 
@@ -26,7 +27,7 @@ struct slap_internal_schema slap_schema;
 static int
 objectClassMatch(
        int *matchp,
-       unsigned flags,
+       slap_mask_t flags,
        Syntax *syntax,
        MatchingRule *mr,
        struct berval *value,
@@ -72,7 +73,7 @@ objectClassMatch(
 static int
 structuralObjectClassMatch(
        int *matchp,
-       unsigned flags,
+       slap_mask_t flags,
        Syntax *syntax,
        MatchingRule *mr,
        struct berval *value,
@@ -218,6 +219,9 @@ schema_prep( void )
        /* we should only be called once after schema_init() was called */
        assert( schema_init_done == 1 );
 
+       ucdata_load( global_ucdata_path ? global_ucdata_path :
+               SLAPD_DEFAULT_UCDATA, UCDATA_CASE|UCDATA_CTYPE|UCDATA_NUM );
+
        for( i=0; oc_map[i].ssom_name; i++ ) {
                ObjectClass ** ocp = (ObjectClass **)
                        &(((char *) &slap_schema)[oc_map[i].ssom_offset]);