Commit e7523b14 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

add si_syn_octetString to keep syntax load checks in one place.

parent 111b4646
......@@ -583,6 +583,8 @@ static struct slap_schema_syn_map {
char *sssm_name;
size_t sssm_offset;
} syn_map[] = {
{ "1.3.6.1.4.1.1466.115.121.1.40",
offsetof(struct slap_internal_schema, si_syn_octetString) },
{ "1.3.6.1.4.1.1466.115.121.1.12",
offsetof(struct slap_internal_schema, si_syn_distinguishedName) },
{ "1.3.6.1.4.1.1466.115.121.1.27",
......@@ -703,12 +705,7 @@ slap_schema_check( void )
}
}
slap_at_undefined.sat_syntax = syn_find( SLAPD_OCTETSTRING_SYNTAX );
if( slap_at_undefined.sat_syntax == NULL ) {
fprintf( stderr, "slap_schema_check: "
"No octetString syntax \"" SLAPD_OCTETSTRING_SYNTAX "\"\n" );
return LDAP_INVALID_SYNTAX;
}
slap_at_undefined.sat_syntax = slap_schema.si_syn_distinguishedName;
slap_schema.si_at_undefined = &slap_at_undefined;
for( i=0; ad_map[i].ssam_name; i++ ) {
......
......@@ -636,6 +636,7 @@ struct slap_internal_schema {
MatchingRule *si_mr_integerMatch;
/* Syntaxes */
Syntax *si_syn_octetString;
Syntax *si_syn_distinguishedName;
Syntax *si_syn_integer;
};
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment