Clean up include logging

[openldap] / servers / slapd / mra.c

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index 8469ae30cba0b44ea7fadfa54a002c92bd37303f..fe883e6e54636c53b65db5229a98b0cf11c4737b 100644 (file)
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.c
@@ -22,7 +22,7 @@ mra_free(
 )
 {
        ad_free( mra->ma_desc, 1 );
-       ch_free( (char *) mra->ma_rule );
+       ch_free( mra->ma_rule_text );
        ber_bvfree( mra->ma_value );
        if ( freeit ) {
                ch_free( (char *) mra );
@@ -43,6 +43,7 @@ get_mra(
 
        ma = ch_malloc( sizeof( MatchingRuleAssertion ) );
        ma->ma_rule = NULL;
+       ma->ma_rule_text = NULL;
        ma->ma_desc = NULL;
        ma->ma_dnattrs = 0;
        ma->ma_value = NULL;
@@ -50,25 +51,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;
        }
 
        if ( tag == LDAP_FILTER_EXT_OID ) {
-               rc = ber_scanf( ber, "a", &ma->ma_rule );
+               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" ));
+#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_find( 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;
@@ -78,7 +98,13 @@ get_mra(
        if ( tag == LDAP_FILTER_EXT_TYPE ) {
                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" ));
+#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;
                }
@@ -95,7 +121,13 @@ 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;
@@ -103,7 +135,13 @@ get_mra(
        }
 
        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;
@@ -112,7 +150,13 @@ get_mra(
        rc = ber_scanf( ber, "o", &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;
@@ -142,7 +186,13 @@ get_mra(
        }
 
        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;