r3783: - don't use make proto for ldb anymore

- split ldh.h out of samba's includes.h

- make ldb_context and ldb_module private to the subsystem

- use ltdb_ prefix for all ldb_tdb functions

metze
(This used to be commit f5ee40d6ce8224e280070975efc9911558fe675c)

1 files changed, 7 insertions, 5 deletions

diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
index a2aa5a7aca..5f6af43f94 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c
@@ -36,6 +36,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 #include "ldb/ldb_tdb/ldb_tdb.h"
 
 /*
@@ -195,7 +197,7 @@ int ltdb_store(struct ldb_module *module, const struct ldb_message *msg, int flg
 		return -1;
 	}
 
-	ret = ltdb_pack_data(ldb, msg, &tdb_data);
+	ret = ltdb_pack_data(module, msg, &tdb_data);
 	if (ret == -1) {
 		ldb_free(ldb, tdb_key.dptr);
 		return -1;
@@ -439,7 +441,7 @@ static int msg_delete_element(struct ldb_module *module,
 	el = &msg->elements[found];
 
 	for (i=0;i<el->num_values;i++) {
-		if (ldb_val_equal(module, msg->elements[i].name, &el->values[i], val)) {
+		if (ltdb_val_equal(module, msg->elements[i].name, &el->values[i], val)) {
 			if (i<el->num_values-1) {
 				memmove(&el->values[i], &el->values[i+1],
 					sizeof(el->values[i])*(el->num_values-(i+1)));
@@ -483,7 +485,7 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms
 		return -1;
 	}
 
-	ret = ltdb_unpack_data(ldb, &tdb_data, &msg2);
+	ret = ltdb_unpack_data(module, &tdb_data, &msg2);
 	if (ret == -1) {
 		ldb_free(ldb, tdb_key.dptr);
 		free(tdb_data.dptr);
@@ -551,13 +553,13 @@ int ltdb_modify_internal(struct ldb_module *module, const struct ldb_message *ms
 
 	ldb_free(ldb, tdb_key.dptr);
 	free(tdb_data.dptr);
-	ltdb_unpack_data_free(ldb, &msg2);
+	ltdb_unpack_data_free(module, &msg2);
 	return ret;
 
 failed:
 	ldb_free(ldb, tdb_key.dptr);
 	free(tdb_data.dptr);
-	ltdb_unpack_data_free(ldb, &msg2);
+	ltdb_unpack_data_free(module, &msg2);
 	return -1;
 }