Extend value_match to extract an asserted value from a full value

[openldap] / servers / slapd / mra.c

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index 7373978c3946b745689b5335d36ca757782fe5af..1e66f91f6d6b10f4072ee3a46847fc07c7a0384d 100644 (file)
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -21,7 +21,6 @@ mra_free(
     int        freeit
 )
 {
-       ad_free( mra->ma_desc, 1 );
        ch_free( mra->ma_rule_text );
        ber_bvfree( mra->ma_value );
        if ( freeit ) {
@@ -52,8 +51,8 @@ get_mra(
 
        if( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "get_mra: ber_scanf (\"{t\") failure\n" ));
+               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
@@ -67,8 +66,8 @@ get_mra(
                rc = ber_scanf( ber, "a", &ma->ma_rule_text );
                if ( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "get_mra: ber_scanf(\"a\") failure.\n" ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                                  "get_mra: ber_scanf(\"a\") failure.\n" ));
 #else
                        Debug( LDAP_DEBUG_ANY, "  get_mra ber_scanf for mr\n", 0, 0, 0 );
 #endif
@@ -83,8 +82,8 @@ get_mra(
 
                if( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "get_mra: ber_scanf (\"t\") failure\n" ));
+                       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
@@ -99,8 +98,8 @@ get_mra(
                rc = ber_scanf( ber, "o", &type );
                if ( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "get_mra: ber_scanf (\"o\") failure.\n" ));
+                       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
@@ -122,8 +121,8 @@ get_mra(
 
                if( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                               "get_mra: ber_scanf (\"t\") failure.\n" ));
+                       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
@@ -136,8 +135,8 @@ get_mra(
 
        if ( tag != LDAP_FILTER_EXT_VALUE ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "get_mra: ber_scanf missing value\n" ));
+               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
@@ -151,8 +150,8 @@ get_mra(
 
        if( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "get_mra: ber_scanf (\"o\") failure.\n" ));
+               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
@@ -187,8 +186,8 @@ get_mra(
 
        if( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-            LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "get_mra: ber_scanf failure\n"));
+               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