From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 26 Mar 2005 00:53:00 +0000 (+0000)
Subject: Change "subtree delete not supported" diagnostic text to
X-Git-Tag: OPENLDAP_AC_BP~1065
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=71c2c1c9fe1b8968b13985f83aec605c1c780129;p=openldap

Change "subtree delete not supported" diagnostic text to
"subordinate objects must be deleted first" as the "not supported"
language implies some feature of LDAP is not implemented in slapd(8).
---

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 142e698781..f5910ef9a3 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -345,7 +345,7 @@ retry:	/* transaction retry */
 				": non-leaf %s\n",
 				op->o_req_dn.bv_val, 0, 0);
 			rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF;
-			rs->sr_text = "subtree delete not supported";
+			rs->sr_text = "subordinate objects must be deleted first";
 			break;
 		default:
 			Debug(LDAP_DEBUG_ARGS,
diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c
index 7f1a4d5cb4..dc6256ac22 100644
--- a/servers/slapd/back-ldbm/delete.c
+++ b/servers/slapd/back-ldbm/delete.c
@@ -115,7 +115,7 @@ ldbm_back_delete(
 			op->o_req_dn.bv_val, 0, 0);
 
 		send_ldap_error( op, rs, LDAP_NOT_ALLOWED_ON_NONLEAF,
-			"subtree delete not supported" );
+			"subordinate objects must be deleted first");
 		goto return_results;
 	}
 
diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c
index 79a8e98e54..9d85cce33a 100644
--- a/servers/slapd/back-sql/delete.c
+++ b/servers/slapd/back-sql/delete.c
@@ -186,7 +186,7 @@ backsql_delete( Operation *op, SlapReply *rs )
 			"entry \"%s\" has children\n",
 			op->o_req_dn.bv_val, 0, 0 );
 		rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF;
-		rs->sr_text = "subtree delete not supported";
+		rs->sr_text = "subordinate objects must be deleted first";
 		/* fallthru */
 
 	default: