upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-29 19:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix wrong error when using operative attribute in

Browse source 
objectclass definition (ITS#3205)
This commit is contained in:
Kurt Zeilenga 2004-06-25 01:05:49 +00:00
parent 3c68fc1f14
commit e8b2c7f3be
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
servers/slapd/oc.c
View file

@ -469,6 +469,7 @@ oc_add(
}
if ( code != 0 ) return code;
if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
code = oc_create_required( soc, soc->soc_at_oids_must, &op, err );
if ( code != 0 ) return code;
@ -476,7 +477,7 @@ oc_add(
code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
if ( code != 0 ) return code;
if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
code = oc_insert(soc,err);
return code;

9
servers/slapd/schemaparse.c
View file

@ -126,8 +126,7 @@ parse_cr(
const char *fname,
int lineno,
char *line,
char **argv
)
char **argv )
{
LDAPContentRule *cr;
int code;
@ -165,8 +164,7 @@ parse_oc(
const char *fname,
int lineno,
char *line,
char **argv
)
char **argv )
{
LDAPObjectClass *oc;
int code;
@ -247,8 +245,7 @@ parse_at(
const char *fname,
int lineno,
char *line,
char **argv
)
char **argv )
{
LDAPAttributeType *at;
int code;