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 57df22771a2e5ab162655ff67d62561ed7463e92..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,
@@ -199,6 +200,17 @@ struct slap_schema_ad_map {
        { NULL, NULL, NULL, NULL, 0 }
 };
 
+static AttributeType slap_at_undefined = {
+       "UNDEFINED", /* cname */
+       { "1.1.1", NULL, NULL, 1, NULL,
+               NULL, NULL, NULL, NULL,
+               0, 0, 0, 1, 3 },
+       NULL, /* sup */
+       NULL, /* subtypes */
+       NULL, NULL, NULL, NULL, /* matching rules */
+       NULL, /* syntax (this may need to be defined) */
+       NULL  /* next */
+};
 
 int
 schema_prep( void )
@@ -207,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]);
@@ -245,6 +260,14 @@ schema_prep( void )
                }
        }
 
+       slap_at_undefined.sat_syntax = syn_find( SLAPD_OCTETSTRING_SYNTAX );
+       if( slap_at_undefined.sat_syntax == NULL ) {
+               fprintf( stderr,
+                       "No octetString syntax \"" SLAPD_OCTETSTRING_SYNTAX "\"\n" );
+               return LDAP_INVALID_SYNTAX;
+       }
+       slap_schema.si_at_undefined = &slap_at_undefined;
+
        ++schema_init_done;
        return LDAP_SUCCESS;
 }