Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
David Barchiesi
OpenLDAP
Commits
6ae9bf16
Commit
6ae9bf16
authored
Dec 01, 2020
by
Howard Chu
Browse files
ITS#9014 fix component match parsing errors
parent
e394bcfa
Changes
2
Hide whitespace changes
Inline
Side-by-side
servers/slapd/component.c
View file @
6ae9bf16
...
...
@@ -347,7 +347,7 @@ get_comp_filter( Operation* op, struct berval* bv,
return
rc
;
}
rc
=
parse_comp_filter
(
op
,
&
cav
,
filt
,
text
);
bv
->
bv_val
=
cav
.
cav_ptr
;
/*
bv->bv_val = cav.cav_ptr;
*/
return
rc
;
}
...
...
@@ -1067,7 +1067,7 @@ parse_comp_filter( Operation* op, ComponentAssertionValue* cav,
*/
ber_tag_t
tag
;
int
err
;
int
err
=
LDAP_SUCCESS
;
ComponentFilter
f
;
/* TAG : item, and, or, not in RFC 4515 */
tag
=
strip_cav_tag
(
cav
);
...
...
@@ -1077,10 +1077,11 @@ parse_comp_filter( Operation* op, ComponentAssertionValue* cav,
return
LDAP_PROTOCOL_ERROR
;
}
if
(
tag
!=
LDAP_COMP_FILTER_NOT
)
strip_cav_str
(
cav
,
"{"
);
err
=
LDAP_SUCCESS
;
if
(
tag
!=
LDAP_COMP_FILTER_NOT
)
{
err
=
strip_cav_str
(
cav
,
"{"
);
if
(
err
)
goto
invalid
;
}
f
.
cf_next
=
NULL
;
f
.
cf_choice
=
tag
;
...
...
@@ -1154,13 +1155,14 @@ parse_comp_filter( Operation* op, ComponentAssertionValue* cav,
break
;
}
invalid:
if
(
err
!=
LDAP_SUCCESS
&&
err
!=
SLAPD_DISCONNECT
)
{
*
text
=
"Component Filter Syntax Error"
;
return
err
;
}
if
(
tag
!=
LDAP_COMP_FILTER_NOT
)
strip_cav_str
(
cav
,
"}"
);
err
=
strip_cav_str
(
cav
,
"}"
);
if
(
err
==
LDAP_SUCCESS
)
{
if
(
op
)
{
...
...
servers/slapd/schema_init.c
View file @
6ae9bf16
...
...
@@ -327,6 +327,9 @@ certificateValidate( Syntax *syntax, struct berval *in )
ber_len_t
len
;
ber_int_t
version
=
SLAP_X509_V1
;
if
(
BER_BVISNULL
(
in
)
||
BER_BVISEMPTY
(
in
))
return
LDAP_INVALID_SYNTAX
;
ber_init2
(
ber
,
in
,
LBER_USE_DER
);
tag
=
ber_skip_tag
(
ber
,
&
len
);
/* Signed wrapper */
if
(
tag
!=
LBER_SEQUENCE
)
return
LDAP_INVALID_SYNTAX
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment