From: Kurt Zeilenga Date: Mon, 15 Sep 2003 21:53:58 +0000 (+0000) Subject: cleanup X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~721 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8f0bc2d55be706aab9ceb2820140ccda6d9f5a6d;p=openldap cleanup --- diff --git a/servers/slapd/back-bdb/passwd.c b/servers/slapd/back-bdb/passwd.c index c75aba915d..e8ca8f70f7 100644 --- a/servers/slapd/back-bdb/passwd.c +++ b/servers/slapd/back-bdb/passwd.c @@ -212,7 +212,8 @@ retry: /* transaction retry */ if( rc != 0 ) { #ifdef NEW_LOGGING LDAP_LOG ( OPERATION, ERR, - "bdb_exop_passwd: txn_begin(2) failed: %s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 ); + "bdb_exop_passwd: txn_begin(2) failed: %s (%d)\n", + db_strerror(rs->sr_err), rs->sr_err, 0 ); #else Debug( LDAP_DEBUG_TRACE, "bdb_exop_passwd: txn_begin(2) failed: %s (%d)\n", @@ -222,6 +223,7 @@ retry: /* transaction retry */ rs->sr_text = "internal error"; goto done; } + { Modifications ml; struct berval vals[2]; diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c index 18e8920f25..b5d0c5ebdc 100644 --- a/servers/slapd/back-ldbm/passwd.c +++ b/servers/slapd/back-ldbm/passwd.c @@ -40,13 +40,12 @@ ldbm_back_exop_passwd( #ifdef NEW_LOGGING LDAP_LOG( BACK_LDBM, ENTRY, - "ldbm_back_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0,0 ); + "ldbm_back_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0,0 ); #else Debug( LDAP_DEBUG_ARGS, "==> ldbm_back_exop_passwd: \"%s\"\n", id.bv_val ? id.bv_val : "", 0, 0 ); #endif - if( rc != LDAP_SUCCESS ) { goto done; } diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c index d1f7cdcd32..80241ecd14 100644 --- a/servers/slapd/passwd.c +++ b/servers/slapd/passwd.c @@ -59,8 +59,7 @@ int passwd_extop( BerVarray defref = NULL; if ( op->o_bd->syncinfo ) { defref = op->o_bd->syncinfo->provideruri_bv; - } else - { + } else { defref = referral_rewrite( op->o_bd->be_update_refs, NULL, NULL, LDAP_SCOPE_DEFAULT ); }