X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fmra.c;h=87b4a47dda779fc9b6fd5d655690eeae8a9ea171;hb=2c94c7915a52f8df4323c8193ec424df568f0fc1;hp=d6fc66b58ad5d4208af539d71d13d9bfbf46c652;hpb=d4b63dd3e37d1ae5f74e93bbc9ab8a278033ddbf;p=openldap

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index d6fc66b58a..87b4a47dda 100644
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* mra.c - routines for dealing with extensible matching rule assertions */
@@ -21,9 +21,10 @@ mra_free(
     int	freeit
 )
 {
-	ad_free( mra->ma_desc, 1 );
-	ch_free( (char *) mra->ma_rule );
-	ber_bvfree( mra->ma_value );
+#if 0	/* no longer a malloc'd string */
+	ch_free( mra->ma_rule_text.bv_val );
+#endif
+	ch_free( mra->ma_value.bv_val );
 	if ( freeit ) {
 		ch_free( (char *) mra );
 	}
@@ -37,53 +38,82 @@ get_mra(
 )
 {
 	int rc, tag;
-	struct berval type, value, *nvalue;
+	ber_len_t length;
+	struct berval type, value;
 	MatchingRuleAssertion *ma;
 
 	ma = ch_malloc( sizeof( MatchingRuleAssertion ) );
 	ma->ma_rule = NULL;
+	ma->ma_rule_text.bv_val = NULL;
+	ma->ma_rule_text.bv_len = 0;
 	ma->ma_desc = NULL;
 	ma->ma_dnattrs = 0;
-	ma->ma_value = NULL;
+	ma->ma_value.bv_val = NULL;
 
 	rc = ber_scanf( ber, "{t", &tag );
 
 	if( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			   "get_mra: ber_scanf (\"{t\") failure\n" ));
+#else
 		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
+#endif
+
 		*text = "Error parsing matching rule assertion";
+		mra_free( ma, 1 );
 		return SLAPD_DISCONNECT;
 	}
 
 	if ( tag == LDAP_FILTER_EXT_OID ) {
-		rc = ber_scanf( ber, "a", &ma->ma_rule );
+		rc = ber_scanf( ber, "m", &ma->ma_rule_text );
 		if ( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+				   "get_mra: ber_scanf(\"o\") failure.\n" ));
+#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";
+			mra_free( ma, 1 );
 			return SLAPD_DISCONNECT;
 		}
+		ma->ma_rule = mr_bvfind( &ma->ma_rule_text );
 
 		rc = ber_scanf( ber, "t", &tag );
 
 		if( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+				   "get_mra: ber_scanf (\"t\") failure\n" ));
+#else
 			Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
+#endif
+
 			*text = "Error parsing matching rule assertion";
+			mra_free( ma, 1 );
 			return SLAPD_DISCONNECT;
 		}
 	}
 
 	if ( tag == LDAP_FILTER_EXT_TYPE ) {
-		rc = ber_scanf( ber, "o", &type );
+		rc = ber_scanf( ber, "m", &type );
 		if ( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+				   "get_mra: ber_scanf (\"o\") failure.\n" ));
+#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;
 		}
 
 		rc = slap_bv2ad( &type, &ma->ma_desc, text );
-		ch_free( type.bv_val );
 
 		if( rc != LDAP_SUCCESS ) {
-			ch_free( value.bv_val );
 			mra_free( ma, 1 );
 			return rc;
 		}
@@ -91,17 +121,44 @@ get_mra(
 		rc = ber_scanf( ber, "t", &tag );
 
 		if( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+			LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+				   "get_mra: ber_scanf (\"t\") failure.\n" ));
+#else
 			Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
+#endif
+
 			*text = "Error parsing matching rule assertion";
+			mra_free( ma, 1 );
 			return SLAPD_DISCONNECT;
 		}
 	}
 
-	rc = ber_scanf( ber, "o", &value );
+	if ( tag != LDAP_FILTER_EXT_VALUE ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			   "get_mra: ber_scanf missing value\n" ));
+#else
+		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf missing value\n", 0, 0, 0 );
+#endif
+
+		*text = "Missing value in matching rule assertion";
+		mra_free( ma, 1 );
+		return SLAPD_DISCONNECT;
+	}
+
+	rc = ber_scanf( ber, "m", &value );
 
 	if( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			   "get_mra: ber_scanf (\"o\") failure.\n" ));
+#else
 		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
+#endif
+
 		*text = "Error decoding value in matching rule assertion";
+		mra_free( ma, 1 );
 		return SLAPD_DISCONNECT;
 	}
 
@@ -109,16 +166,35 @@ get_mra(
 	 * OK, if no matching rule, normalize for equality, otherwise
 	 * normalize for the matching rule.
 	 */
-	rc = value_normalize( ma->ma_desc, SLAP_MR_EQUALITY, &value, &nvalue, text );
-	ch_free( value.bv_val );
+	rc = value_normalize( ma->ma_desc, SLAP_MR_EQUALITY, &value, &ma->ma_value, text );
 
 	if( rc != LDAP_SUCCESS ) {
-		ad_free( ma->ma_desc, 1 );
-		ch_free( ma );
+		mra_free( ma, 1 );
 		return rc;
 	}
 
-	ma->ma_value = nvalue;
+	tag = ber_peek_tag( ber, &length );
+
+	if ( tag == LDAP_FILTER_EXT_DNATTRS ) {
+		rc = ber_scanf( ber, "b}", &ma->ma_dnattrs );
+	} else {
+		rc = ber_scanf( ber, "}" );
+		ma->ma_dnattrs = 0;
+	}
+
+	if( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+			   "get_mra: ber_scanf failure\n"));
+#else
+		Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf\n", 0, 0, 0 );
+#endif
+
+		*text = "Error decoding dnattrs matching rule assertion";
+		mra_free( ma, 1 );
+		return SLAPD_DISCONNECT;
+	}
+
 	*mra = ma;
 
 	return LDAP_SUCCESS;