Commit b855258a authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

ITS#9416 more componentFilterMatch garbage

parent dfafcdd0
Pipeline #1317 passed with stage
in 56 minutes and 38 seconds
...@@ -905,31 +905,37 @@ strip_cav_str( ComponentAssertionValue* cav, char* str) ...@@ -905,31 +905,37 @@ strip_cav_str( ComponentAssertionValue* cav, char* str)
static ber_tag_t static ber_tag_t
strip_cav_tag( ComponentAssertionValue* cav ) strip_cav_tag( ComponentAssertionValue* cav )
{ {
int rc;
eat_whsp( cav ); eat_whsp( cav );
if ( cav_cur_len( cav ) >= 8 && strncmp( cav->cav_ptr, "item", 4 ) == 0 ) { if ( cav_cur_len( cav ) >= 8 && strncmp( cav->cav_ptr, "item", 4 ) == 0 ) {
strip_cav_str( cav , "item:" ); if ( strip_cav_str( cav , "item:" ))
goto fail;
return LDAP_COMP_FILTER_ITEM; return LDAP_COMP_FILTER_ITEM;
} else if ( cav_cur_len( cav ) >= 7 && } else if ( cav_cur_len( cav ) >= 7 &&
strncmp( cav->cav_ptr, "and", 3 ) == 0 ) strncmp( cav->cav_ptr, "and", 3 ) == 0 )
{ {
strip_cav_str( cav , "and:" ); if ( strip_cav_str( cav , "and:" ))
goto fail;
return LDAP_COMP_FILTER_AND; return LDAP_COMP_FILTER_AND;
} else if ( cav_cur_len( cav ) >= 6 && } else if ( cav_cur_len( cav ) >= 6 &&
strncmp( cav->cav_ptr, "or" , 2 ) == 0 ) strncmp( cav->cav_ptr, "or" , 2 ) == 0 )
{ {
strip_cav_str( cav , "or:" ); if ( strip_cav_str( cav , "or:" ))
goto fail;
return LDAP_COMP_FILTER_OR; return LDAP_COMP_FILTER_OR;
} else if ( cav_cur_len( cav ) >= 7 && } else if ( cav_cur_len( cav ) >= 7 &&
strncmp( cav->cav_ptr, "not", 3 ) == 0 ) strncmp( cav->cav_ptr, "not", 3 ) == 0 )
{ {
strip_cav_str( cav , "not:" ); if ( strip_cav_str( cav , "not:" ))
goto fail;
return LDAP_COMP_FILTER_NOT; return LDAP_COMP_FILTER_NOT;
} }
fail:
return LBER_ERROR; return LBER_ERROR;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment