From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 11 Sep 2004 16:16:41 +0000 (+0000)
Subject: minor improvements
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~543
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c04bebe750d6693d0a3401729659c2534955b2d2;p=openldap

minor improvements
---

diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c
index beed3cd95d..31d0ef8c10 100644
--- a/servers/slapd/back-sql/delete.c
+++ b/servers/slapd/back-sql/delete.c
@@ -163,6 +163,12 @@ backsql_delete( Operation *op, SlapReply *rs )
 		goto done;
 	}
 
+	/* avl_apply ... */
+	rs->sr_err = backsql_delete_all_attrs( op, rs, dbh, &e_id, oc );
+	if ( rs->sr_err != LDAP_SUCCESS ) {
+		goto done;
+	}
+
 	rc = backsql_Prepare( dbh, &sth, oc->bom_delete_proc, 0 );
 	if ( rc != SQL_SUCCESS ) {
 		Debug( LDAP_DEBUG_TRACE,
@@ -206,12 +212,6 @@ backsql_delete( Operation *op, SlapReply *rs )
 	}
 	SQLFreeStmt( sth, SQL_DROP );
 
-	/* avl_apply ... */
-	rs->sr_err = backsql_delete_all_attrs( op, rs, dbh, &e_id, oc );
-	if ( rs->sr_err != LDAP_SUCCESS ) {
-		goto done;
-	}
-
 	/* delete "auxiliary" objectClasses, if any... */
 	rc = backsql_Prepare( dbh, &sth, bi->delobjclasses_query, 0 );
 	if ( rc != SQL_SUCCESS ) {
diff --git a/servers/slapd/back-sql/modrdn.c b/servers/slapd/back-sql/modrdn.c
index c17f90415b..419065ccf6 100644
--- a/servers/slapd/back-sql/modrdn.c
+++ b/servers/slapd/back-sql/modrdn.c
@@ -69,7 +69,8 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 	rs->sr_err = backsql_dn2id( bi, &e_id, dbh, &op->o_req_ndn );
 	if ( rs->sr_err != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): "
-			"could not lookup entry id\n", 0, 0, 0 );
+			"could not lookup entry id (%d)\n",
+			rs->sr_err, 0, 0 );
 		rs->sr_text = ( rs->sr_err == LDAP_OTHER )
 			?  "SQL-backend error" : NULL;
 		send_ldap_result( op, rs );