From c5c0c3e4f54ff33163cdd74b74b41f9a16bf2fdf Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 19 Jul 2005 14:25:10 +0000
Subject: [PATCH] fix previous commit (ITS#3871)

---
 servers/slapd/back-meta/add.c    | 15 ++++++++++++---
 servers/slapd/back-meta/delete.c | 14 ++++++++++++--
 servers/slapd/back-meta/modify.c | 16 +++++++++++++---
 servers/slapd/back-meta/modrdn.c | 19 ++++++++++++++-----
 4 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 3cc3431d73..9628cdd6ec 100644
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -175,6 +175,7 @@ retry:;
 	} else if ( rs->sr_err == LDAP_SUCCESS ) {
 		struct timeval	tv, *tvp = NULL;
 		LDAPMessage	*res = NULL;
+		int		rc;
 
 		if ( mi->mi_targets[ candidate ].mt_timeout[ META_OP_ADD ] != 0 ) {
 			tv.tv_sec = mi->mi_targets[ candidate ].mt_timeout[ META_OP_ADD ];
@@ -182,11 +183,11 @@ retry:;
 			tvp = &tv;
 		}
 
-		rs->sr_err = ldap_result( mc->mc_conns[ candidate ].msc_ld,
+		rs->sr_err = LDAP_OTHER;
+		rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
 			msgid, LDAP_MSG_ONE, tvp, &res );
-		switch ( rs->sr_err ) {
+		switch ( rc ) {
 		case -1:
-			rs->sr_err = LDAP_OTHER;
 			send_ldap_result( op, rs );
 			goto cleanup;
 
@@ -198,6 +199,14 @@ retry:;
 			send_ldap_result( op, rs );
 			goto cleanup;
 
+		case LDAP_RES_ADD:
+			rc = ldap_parse_result( mc->mc_conns[ candidate ].msc_ld,
+				res, &rs->sr_err, NULL, NULL, NULL, NULL, 1 );
+			if ( rc != LDAP_SUCCESS ) {
+				rs->sr_err = rc;
+			}
+			break;
+
 		default:
 			ldap_msgfree( res );
 			break;
diff --git a/servers/slapd/back-meta/delete.c b/servers/slapd/back-meta/delete.c
index 36a89cdadc..7c1463d60f 100644
--- a/servers/slapd/back-meta/delete.c
+++ b/servers/slapd/back-meta/delete.c
@@ -74,6 +74,7 @@ retry:;
 	} else if ( rs->sr_err == LDAP_SUCCESS ) {
 		struct timeval	tv, *tvp = NULL;
 		LDAPMessage	*res = NULL;
+		int		rc;
 
 		if ( mi->mi_targets[ candidate ].mt_timeout[ META_OP_DELETE ] != 0 ) {
 			tv.tv_sec = mi->mi_targets[ candidate ].mt_timeout[ META_OP_DELETE ];
@@ -81,9 +82,10 @@ retry:;
 			tvp = &tv;
 		}
 
-		rs->sr_err = ldap_result( mc->mc_conns[ candidate ].msc_ld,
+		rs->sr_err = LDAP_OTHER;
+		rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
 			msgid, LDAP_MSG_ONE, tvp, &res );
-		switch ( rs->sr_err ) {
+		switch ( rc ) {
 		case -1:
 			rs->sr_err = LDAP_OTHER;
 			send_ldap_result( op, rs );
@@ -97,6 +99,14 @@ retry:;
 			send_ldap_result( op, rs );
 			goto cleanup;
 
+		case LDAP_RES_DELETE:
+			rc = ldap_parse_result( mc->mc_conns[ candidate ].msc_ld,
+				res, &rs->sr_err, NULL, NULL, NULL, NULL, 1 );
+			if ( rc != LDAP_SUCCESS ) {
+				rs->sr_err = rc;
+			}
+			break;
+
 		default:
 			ldap_msgfree( res );
 			break;
diff --git a/servers/slapd/back-meta/modify.c b/servers/slapd/back-meta/modify.c
index 379a1e03ec..f2b40d24a4 100644
--- a/servers/slapd/back-meta/modify.c
+++ b/servers/slapd/back-meta/modify.c
@@ -191,11 +191,11 @@ retry:;
 			tvp = &tv;
 		}
 
-		rs->sr_err = ldap_result( mc->mc_conns[ candidate ].msc_ld,
+		rs->sr_err = LDAP_OTHER;
+		rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
 			msgid, LDAP_MSG_ONE, tvp, &res );
-		switch ( rs->sr_err ) {
+		switch ( rc ) {
 		case -1:
-			rs->sr_err = LDAP_OTHER;
 			rc = -1;
 			break;
 
@@ -207,7 +207,17 @@ retry:;
 			rc = -1;
 			break;
 
+		case LDAP_RES_MODIFY:
+			rc = ldap_parse_result( mc->mc_conns[ candidate ].msc_ld,
+				res, &rs->sr_err, NULL, NULL, NULL, NULL, 1 );
+			if ( rc != LDAP_SUCCESS ) {
+				rs->sr_err = rc;
+			}
+			rc = 0;
+			break;
+
 		default:
+			rc = -1;
 			ldap_msgfree( res );
 			break;
 		}
diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c
index 90b151761e..741571c32d 100644
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -115,6 +115,7 @@ retry:;
 	} else if ( rs->sr_err == LDAP_SUCCESS ) {
 		struct timeval	tv, *tvp = NULL;
 		LDAPMessage	*res = NULL;
+		int		rc;
 
 		if ( mi->mi_targets[ candidate ].mt_timeout[ META_OP_MODRDN ] != 0 ) {
 			tv.tv_sec = mi->mi_targets[ candidate ].mt_timeout[ META_OP_MODRDN ];
@@ -122,11 +123,11 @@ retry:;
 			tvp = &tv;
 		}
 
-		rs->sr_err = ldap_result( mc->mc_conns[ candidate ].msc_ld,
+		rs->sr_err = LDAP_OTHER;
+		rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
 			msgid, LDAP_MSG_ONE, tvp, &res );
-		switch ( rs->sr_err ) {
+		switch ( rc ) {
 		case -1:
-			rs->sr_err = LDAP_OTHER;
 			break;
 
 		case 0:
@@ -136,6 +137,14 @@ retry:;
 				LDAP_ADMINLIMIT_EXCEEDED : LDAP_OPERATIONS_ERROR;
 			break;
 
+		case LDAP_RES_RENAME:
+			rc = ldap_parse_result( mc->mc_conns[ candidate ].msc_ld,
+				res, &rs->sr_err, NULL, NULL, NULL, NULL, 1 );
+			if ( rc != LDAP_SUCCESS ) {
+				rs->sr_err = rc;
+			}
+			break;
+
 		default:
 			ldap_msgfree( res );
 			break;
@@ -157,10 +166,10 @@ cleanup:;
 
 	if ( rs->sr_err == LDAP_SUCCESS ) {
 		meta_back_op_result( mc, op, rs, candidate );
+	} else {
+		send_ldap_result( op, rs );
 	}
 
-	send_ldap_result( op, rs );
-
 	meta_back_release_conn( op, mc );
 
 	return rs->sr_err;
-- 
2.39.5