mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-11-21 01:04:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Import no OID fix

Browse Source
This commit is contained in:
Kurt Zeilenga 2001-10-11 18:49:04 +00:00
parent d990f6a412
commit ef4ffbe253
1 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
servers/slapd/schemaparse.c
View File

@ -203,24 +203,29 @@ parse_oc(
return 1;
}
if ( oc->oc_oid ) {
if ( !OID_LEADCHAR( oc->oc_oid[0] )) {
/* Expand OID macros */
oid = find_oidm( oc->oc_oid );
if ( !oid ) {
fprintf(stderr,
"%s: line %d: OID %s not recognized\n",
fname, lineno, oc->oc_oid);
return 1;
}
if ( oid != oc->oc_oid ) {
ldap_memfree( oc->oc_oid );
oc->oc_oid = oid;
}
if ( oc->oc_oid == NULL ) {
fprintf( stderr,
"%s: line %d: objectclass has no OID\n",
fname, lineno );
oc_usage();
return 1;
}
if ( !OID_LEADCHAR( oc->oc_oid[0] )) {
/* Expand OID macros */
oid = find_oidm( oc->oc_oid );
if ( !oid ) {
fprintf( stderr,
"%s: line %d: OID %s not recognized\n",
fname, lineno, oc->oc_oid);
return 1;
}
if ( oid != oc->oc_oid ) {
ldap_memfree( oc->oc_oid );
oc->oc_oid = oid;
}
}
/* oc->oc_oid == NULL will be an error someday */
code = oc_add(oc,&err);
if ( code ) {
fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
@ -297,23 +302,30 @@ parse_at(
at_usage();
return 1;
}
if ( at->at_oid ) {
if ( !OID_LEADCHAR( at->at_oid[0] )) {
/* Expand OID macros */
oid = find_oidm( at->at_oid );
if ( !oid ) {
fprintf(stderr,
"%s: line %d: OID %s not recognized\n",
fname, lineno, at->at_oid);
return 1;
}
if ( oid != at->at_oid ) {
ldap_memfree( at->at_oid );
at->at_oid = oid;
}
if ( at->at_oid == NULL ) {
fprintf( stderr,
"%s: line %d: attributeType has no OID\n",
fname, lineno );
at_usage();
return 1;
}
if ( !OID_LEADCHAR( at->at_oid[0] )) {
/* Expand OID macros */
oid = find_oidm( at->at_oid );
if ( !oid ) {
fprintf( stderr,
"%s: line %d: OID %s not recognized\n",
fname, lineno, at->at_oid);
return 1;
}
if ( oid != at->at_oid ) {
ldap_memfree( at->at_oid );
at->at_oid = oid;
}
}
/* at->at_oid == NULL will be an error someday */
if ( at->at_syntax_oid && !OID_LEADCHAR( at->at_syntax_oid[0] )) {
/* Expand OID macros */
oid = find_oidm( at->at_syntax_oid );