From e3351f55a4e8fd3c1dde3e8db4f27f693dd87317 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Fri, 6 Sep 2002 03:42:04 +0000 Subject: [PATCH] Sync with HEAD --- servers/slapd/saslauthz.c | 14 ++++++++------ servers/slapd/value.c | 6 ++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c index ded88611f4..24ccf062b4 100644 --- a/servers/slapd/saslauthz.c +++ b/servers/slapd/saslauthz.c @@ -616,15 +616,16 @@ slap_sasl_check_authz( Connection *conn, #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, ENTRY, - "slap_sasl_check_authz: does %s match %s rule in %s?\n", - assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); + "slap_sasl_check_authz: does %s match %s rule in %s?\n", + assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); #else Debug( LDAP_DEBUG_TRACE, "==>slap_sasl_check_authz: does %s match %s rule in %s?\n", assertDN->bv_val, ad->ad_cname.bv_val, searchDN->bv_val); #endif - rc = backend_attribute( NULL, NULL, conn->c_sasl_bindop, NULL, searchDN, ad, &vals ); + rc = backend_attribute( NULL, NULL, conn->c_sasl_bindop, NULL, + searchDN, ad, &vals ); if( rc != LDAP_SUCCESS ) goto COMPLETE; @@ -641,11 +642,12 @@ COMPLETE: #ifdef NEW_LOGGING LDAP_LOG( TRANSPORT, RESULTS, - "slap_sasl_check_authz: %s check returning %s\n", - ad->ad_cname.bv_val, rc, 0 ); + "slap_sasl_check_authz: %s check returning %s\n", + ad->ad_cname.bv_val, rc, 0 ); #else Debug( LDAP_DEBUG_TRACE, - "<==slap_sasl_check_authz: %s check returning %d\n", ad->ad_cname.bv_val, rc, 0); + "<==slap_sasl_check_authz: %s check returning %d\n", + ad->ad_cname.bv_val, rc, 0); #endif return( rc ); diff --git a/servers/slapd/value.c b/servers/slapd/value.c index 3aa2adfa50..c53da1e9eb 100644 --- a/servers/slapd/value.c +++ b/servers/slapd/value.c @@ -330,7 +330,6 @@ int value_find_ex( int i; int rc; struct berval nval = { 0, NULL }; - struct berval nval_tmp; MatchingRule *mr = ad->ad_type->sat_equality; if( mr == NULL || !mr->smr_match ) { @@ -351,8 +350,11 @@ int value_find_ex( } if( mr->smr_syntax->ssyn_normalize ) { + struct berval nval_tmp; + rc = mr->smr_syntax->ssyn_normalize( - mr->smr_syntax, nval.bv_val == NULL ? val : &nval, &nval_tmp ); + mr->smr_syntax, + nval.bv_val == NULL ? val : &nval, &nval_tmp ); free(nval.bv_val); nval = nval_tmp; -- 2.39.5