r12540: Provide more information in the ldb error string.

Andrew Bartlett
(This used to be commit 31f65e510cdd46b1962cf06b3d51f152b1cecf37)

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index 0de7a3e558a5b47fd7c5e8ececcd0bc87dc43a27..ebee029d9cf504b3c3ea90f3e31655b3325f7d8a 100644 (file)
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -577,7 +577,7 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms
                        if (msg->elements[i].num_values == 0) {
                                if (msg_delete_attribute(module, ldb, msg2, 
                                                         msg->elements[i].name) != 0) {
-                                       err_string = talloc_strdup(module, "No such attribute");
+                                       err_string = talloc_asprintf(module, "No such attribute: %s", msg->elements[i].name);
                                        if (err_string) ldb_set_errstring(module, err_string);
                                        ret = LDB_ERR_NO_SUCH_ATTRIBUTE;
                                        goto failed;
@@ -589,7 +589,7 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms
                                                       msg2, 
                                                       msg->elements[i].name,
                                                       &msg->elements[i].values[j]) != 0) {
-                                       err_string = talloc_strdup(module, "No such attribute");
+                                       err_string = talloc_asprintf(module, "No such attribute: %s", msg->elements[i].name);
                                        if (err_string) ldb_set_errstring(module, err_string);
                                        ret = LDB_ERR_NO_SUCH_ATTRIBUTE;
                                        goto failed;
@@ -600,7 +600,9 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms
                        }
                        break;
                default:
-                       err_string = talloc_strdup(module, "Invalid ldb_modify flags");
+                       err_string = talloc_asprintf(module, "Invalid ldb_modify flags on %s: 0x%x", 
+                                                    msg->elements[i].name, 
+                                                    msg->elements[i].flags & LDB_FLAG_MOD_MASK);
                        if (err_string) ldb_set_errstring(module, err_string);
                        ret = LDB_ERR_PROTOCOL_ERROR;
                        goto failed;