Sync with HEAD as of 14-March-2004

[openldap] / servers / slapd / back-ldap / suffixmassage.c

diff --git a/servers/slapd/back-ldap/suffixmassage.c b/servers/slapd/back-ldap/suffixmassage.c
index 2cee6844516cddb1541d74be2ee36511328276bb..2ad3bafdf8a05fa50baa1d77b46f811596e4db75 100644 (file)
--- a/servers/slapd/back-ldap/suffixmassage.c
+++ b/servers/slapd/back-ldap/suffixmassage.c
@@ -42,8 +42,11 @@ ldap_back_dn_massage(
 {
        int rc = 0;
 
-       switch (rewrite_session( dc->rwmap->rwm_rw, dc->ctx, (dn->bv_len ? dn->bv_val : ""), dc->conn, 
-                               &res->bv_val )) {
+       rc = rewrite_session( dc->rwmap->rwm_rw, dc->ctx,
+                       ( dn->bv_len ? dn->bv_val : "" ), dc->conn,
+                       &res->bv_val );
+
+       switch ( rc ) {
        case REWRITE_REGEXEC_OK:
                if ( res->bv_val != NULL ) {
                        res->bv_len = strlen( res->bv_val );
@@ -52,10 +55,12 @@ ldap_back_dn_massage(
                }
 #ifdef NEW_LOGGING
                LDAP_LOG( BACK_LDAP, DETAIL1, 
-                       "[rw] %s: \"%s\" -> \"%s\"\n", dc->ctx, dn->bv_val, res->bv_val );              
+                       "[rw] %s: \"%s\" -> \"%s\"\n",
+                       dc->ctx, dn->bv_val, res->bv_val );             
 #else /* !NEW_LOGGING */
                Debug( LDAP_DEBUG_ARGS,
-                       "[rw] %s: \"%s\" -> \"%s\"\n", dc->ctx, dn->bv_val, res->bv_val );              
+                       "[rw] %s: \"%s\" -> \"%s\"\n",
+                       dc->ctx, dn->bv_val, res->bv_val );             
 #endif /* !NEW_LOGGING */
                rc = LDAP_SUCCESS;
                break;