mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

validate object class before checking required and allowed

Browse Source
This commit is contained in:
Gary Williams 1999-08-30 14:19:53 +00:00
parent 40fa9d36ce
commit 6db0228171
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
servers/slapd/schema.c
View File

@ -28,9 +28,11 @@ int
oc_schema_check( Entry *e ) oc_schema_check( Entry *e )
{ {
Attribute *a, *aoc; Attribute *a, *aoc;
ObjectClass *oc;
int i; int i;
int ret = 0; int ret = 0;
/* find the object class attribute - could error out here */ /* find the object class attribute - could error out here */
if ( (aoc = attr_find( e->e_attrs, "objectclass" )) == NULL ) { if ( (aoc = attr_find( e->e_attrs, "objectclass" )) == NULL ) {
Debug( LDAP_DEBUG_ANY, "No object class for entry (%s)\n", Debug( LDAP_DEBUG_ANY, "No object class for entry (%s)\n",
@ -40,14 +42,23 @@ oc_schema_check( Entry *e )
/* check that the entry has required attrs for each oc */ /* check that the entry has required attrs for each oc */
for ( i = 0; aoc->a_vals[i] != NULL; i++ ) { for ( i = 0; aoc->a_vals[i] != NULL; i++ ) {
char *s = oc_check_required( e, aoc->a_vals[i]->bv_val ); if ( (oc = oc_find( aoc->a_vals[i]->bv_val )) == NULL ) {
if (s != NULL) {
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"Entry (%s), oc \"%s\" requires attr \"%s\"\n", "Objectclass \"%s\" not defined",
e->e_dn, aoc->a_vals[i]->bv_val, s ); aoc->a_vals[i]->bv_val, 0, 0 );
ret = 1; ret = 1;
} }
else
{
char *s = oc_check_required( e, aoc->a_vals[i]->bv_val );
if (s != NULL) {
Debug( LDAP_DEBUG_ANY,
"Entry (%s), oc \"%s\" requires attr \"%s\"\n",
e->e_dn, aoc->a_vals[i]->bv_val, s );
ret = 1;
}
}
} }
if ( ret != 0 ) { if ( ret != 0 ) {