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

ITS#9556 Send INVALID_SYNTAX for invalid schema elements

Browse Source
This commit is contained in:
Ondřej Kuzník 2021-11-15 14:42:04 +00:00 committed by Quanah Gibson-Mount
parent def3a958ec
commit fbd4f9abdd
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
servers/slapd/bconfig.c
View File

@ -2105,7 +2105,10 @@ config_generic(ConfigArgs *c) {
} }
/* else prev is NULL, append to end of global list */ /* else prev is NULL, append to end of global list */
} }
if(parse_oc(c, &oc, prev)) return(1); if ( parse_oc( c, &oc, prev ) ) {
c->reply.err = LDAP_INVALID_SYNTAX;
return(1);
}
if (!cfn->c_oc_head || !c->valx) cfn->c_oc_head = oc; if (!cfn->c_oc_head || !c->valx) cfn->c_oc_head = oc;
if (cfn->c_oc_tail == prev) cfn->c_oc_tail = oc; if (cfn->c_oc_tail == prev) cfn->c_oc_tail = oc;
} }
@ -2138,7 +2141,10 @@ config_generic(ConfigArgs *c) {
} }
/* else prev is NULL, append to end of global list */ /* else prev is NULL, append to end of global list */
} }
if(parse_at(c, &at, prev)) return(1); if ( parse_at( c, &at, prev ) ) {
c->reply.err = LDAP_INVALID_SYNTAX;
return(1);
}
if (!cfn->c_at_head || !c->valx) cfn->c_at_head = at; if (!cfn->c_at_head || !c->valx) cfn->c_at_head = at;
if (cfn->c_at_tail == prev) cfn->c_at_tail = at; if (cfn->c_at_tail == prev) cfn->c_at_tail = at;
} }
@ -2171,7 +2177,10 @@ config_generic(ConfigArgs *c) {
} }
/* else prev is NULL, append to end of global list */ /* else prev is NULL, append to end of global list */
} }
if ( parse_syn( c, &syn, prev ) ) return(1); if ( parse_syn( c, &syn, prev ) ) {
c->reply.err = LDAP_INVALID_SYNTAX;
return(1);
}
if ( !cfn->c_syn_head || !c->valx ) cfn->c_syn_head = syn; if ( !cfn->c_syn_head || !c->valx ) cfn->c_syn_head = syn;
if ( cfn->c_syn_tail == prev ) cfn->c_syn_tail = syn; if ( cfn->c_syn_tail == prev ) cfn->c_syn_tail = syn;
} }
@ -2182,7 +2191,10 @@ config_generic(ConfigArgs *c) {
if ( c->op == LDAP_MOD_ADD && c->ca_private && cfn != c->ca_private ) if ( c->op == LDAP_MOD_ADD && c->ca_private && cfn != c->ca_private )
cfn = c->ca_private; cfn = c->ca_private;
if(parse_cr(c, &cr)) return(1); if( parse_cr( c, &cr ) ) {
c->reply.err = LDAP_INVALID_SYNTAX;
return(1);
}
if (!cfn->c_cr_head) cfn->c_cr_head = cr; if (!cfn->c_cr_head) cfn->c_cr_head = cr;
cfn->c_cr_tail = cr; cfn->c_cr_tail = cr;
} }

4
tests/scripts/test051-config-undo
View File

@ -72,7 +72,7 @@ olcObjectClasses: ( rawr )
- -
EOF EOF
RC=$? RC=$?
if test $RC != 80 ; then if test $RC != 21 ; then
echo "invalid objectclass modify allowed ($RC)" echo "invalid objectclass modify allowed ($RC)"
test $KILLSERVERS != no && kill -HUP $KILLPIDS test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1 exit 1
@ -87,7 +87,7 @@ olcAttributeTypes: ( rawr )
- -
EOF EOF
RC=$? RC=$?
if test $RC != 80 ; then if test $RC != 21 ; then
echo "invalid attributeType modify allowed ($RC)" echo "invalid attributeType modify allowed ($RC)"
test $KILLSERVERS != no && kill -HUP $KILLPIDS test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1 exit 1