Sync with HEAD

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index ded88611f42a3dd73d799493f69b308984cfa54e..24ccf062b496ce9bded6320abf307d3999edd821 100644 (file)
--- 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 3aa2adfa5000173347769adde26816223823de85..c53da1e9eba7f9a924d95b101d4bbadfe482cd92 100644 (file)
--- 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;