From: Pierangelo Masarati Date: Wed, 17 Jan 2007 21:57:10 +0000 (+0000) Subject: test mapped error code (ITS#4808) X-Git-Tag: OPENLDAP_REL_ENG_2_3_34~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=735e0762d529d4940a4eebe2328ffa69371d893b;p=thirdparty%2Fopenldap.git test mapped error code (ITS#4808) --- diff --git a/CHANGES b/CHANGES index dd8b4e0f72..ef4bcd08ff 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,5 @@ OpenLDAP 2.3 Change Log + Fixed slapd-ldap C-API code tests (ITS#4808) OpenLDAP 2.3.33 Release (2007/01/17) Fixed slapd syncrepl error logging with delta-syncrepl diff --git a/servers/slapd/back-ldap/delete.c b/servers/slapd/back-ldap/delete.c index fa6ff873ac..4f1e67ddf8 100644 --- a/servers/slapd/back-ldap/delete.c +++ b/servers/slapd/back-ldap/delete.c @@ -63,7 +63,7 @@ retry: rc = ldap_back_op_result( lc, op, rs, msgid, li->li_timeout[ SLAP_OP_DELETE ], ( LDAP_BACK_SENDRESULT | retrying ) ); - if ( rs->sr_err == LDAP_SERVER_DOWN && retrying ) { + if ( rs->sr_err == LDAP_UNAVAILABLE && retrying ) { retrying &= ~LDAP_BACK_RETRYING; if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) { /* if the identity changed, there might be need to re-authz */ diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c index a578dd19ab..8fa02ef6e2 100644 --- a/servers/slapd/back-ldap/modrdn.c +++ b/servers/slapd/back-ldap/modrdn.c @@ -88,7 +88,7 @@ retry: rc = ldap_back_op_result( lc, op, rs, msgid, li->li_timeout[ SLAP_OP_MODRDN ], ( LDAP_BACK_SENDRESULT | retrying ) ); - if ( rs->sr_err == LDAP_SERVER_DOWN && retrying ) { + if ( rs->sr_err == LDAP_UNAVAILABLE && retrying ) { retrying &= ~LDAP_BACK_RETRYING; if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) { /* if the identity changed, there might be need to re-authz */