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 142e698781075de17cb638248eab340f9c2d5e22..f5910ef9a35dc0e6f290cda023bebae3b8bc32c9 100644 (file)
--- 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 7f1a4d5cb4d534dadedd5a4546c90271ad4009c0..dc6256ac2252df77cf0c0968c6f83c2f53f08cd4 100644 (file)
--- 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 79a8e98e54201c9d49292d176407ea45e1833b51..9d85cce33a58de3d3c0c6337cf0943de430ce85d 100644 (file)
--- 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: