MatchingRuleAssertion *mra,
int freeit )
{
+#ifdef LDAP_COMP_MATCH
+ /* free component assertion */
+ if ( mra->ma_rule->smr_usage & SLAP_MR_COMPONENT ) {
+ component_free( mra->ma_cf );
+ }
+#endif
/* op->o_tmpfree( mra->ma_value.bv_val, op->o_tmpmemctx ); */
ch_free( mra->ma_value.bv_val );
if ( freeit ) op->o_tmpfree( (char *) mra, op->o_tmpmemctx );
rtag = ber_scanf( ber, "{t" /*"}"*/, &tag );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"{t\") failure\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule assertion";
return SLAPD_DISCONNECT;
if ( tag == LDAP_FILTER_EXT_OID ) {
rtag = ber_scanf( ber, "m", &rule_text );
if ( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf(\"o\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf for mr\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule in matching rule assertion";
return SLAPD_DISCONNECT;
rtag = ber_scanf( ber, "t", &tag );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"t\") failure\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule assertion";
return SLAPD_DISCONNECT;
if ( tag == LDAP_FILTER_EXT_TYPE ) {
rtag = ber_scanf( ber, "m", &type );
if ( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"o\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf for ad\n", 0, 0, 0 );
-#endif
*text = "Error parsing attribute description in matching rule assertion";
return SLAPD_DISCONNECT;
rtag = ber_scanf( ber, "t", &tag );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"t\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error parsing matching rule assertion";
return SLAPD_DISCONNECT;
}
if ( tag != LDAP_FILTER_EXT_VALUE ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf missing value\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf missing value\n", 0, 0, 0 );
-#endif
*text = "Missing value in matching rule assertion";
return SLAPD_DISCONNECT;
rtag = ber_scanf( ber, "m", &value );
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR,
- "get_mra: ber_scanf (\"o\") failure.\n", 0, 0, 0 );
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error decoding value in matching rule assertion";
return SLAPD_DISCONNECT;
}
if( rtag == LBER_ERROR ) {
-#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ERR, "get_mra: ber_scanf failure\n", 0, 0, 0);
-#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
-#endif
*text = "Error decoding dnattrs matching rule assertion";
return SLAPD_DISCONNECT;
SLAP_MR_EXT|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
&value, &ma.ma_value, text, op->o_tmpmemctx );
- if( rc != LDAP_SUCCESS ) {
- return rc;
- }
+ if( rc != LDAP_SUCCESS ) return rc;
#ifdef LDAP_COMP_MATCH
/* Matching Rule for Component Matching */
- Debug( LDAP_DEBUG_FILTER, "matchingrule %s\n",ma.ma_rule->smr_mrule.mr_oid,0,0);
- if( ma.ma_rule && ma.ma_rule->smr_usage & SLAP_MR_COMPONENT )
- rc = get_comp_filter( op, &ma.ma_value, &ma.cf, text );
+ Debug( LDAP_DEBUG_FILTER, "matchingrule %s\n",
+ ma.ma_rule->smr_mrule.mr_oid, 0, 0);
+ if( ma.ma_rule && ma.ma_rule->smr_usage & SLAP_MR_COMPONENT ) {
+ rc = get_comp_filter( op, &ma.ma_value, &ma.ma_cf, text );
if ( rc != LDAP_SUCCESS ) return rc;
+ }
#endif
+
length = sizeof(ma);
/* Append rule_text to end of struct */
if (rule_text.bv_val) length += rule_text.bv_len + 1;