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

source/lib/ldb/common/ldb.c

@@ -33,6 +33,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 
 /* 
  connect to a database. The URL can either be one of the following forms

source/lib/ldb/common/ldb_alloc.c

@@ -33,6 +33,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 
 
 /*
@@ -122,7 +124,7 @@ void *ldb_strdup(struct ldb_context *ldb, const char *str)
 /*
   a ldb wrapper for asprintf(), using ldb_malloc()
 */
-int ldb_asprintf(struct ldb_context *ldb, char **strp, const char *fmt, ...) _PRINTF_ATTRIBUTE(3, 4)
+int ldb_asprintf(struct ldb_context *ldb, char **strp, const char *fmt, ...)
 {
 	int len, len2;
 	va_list ap;

source/lib/ldb/common/ldb_debug.c

@@ -33,6 +33,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 
 
 /*

source/lib/ldb/common/ldb_ldif.c

@@ -37,6 +37,8 @@
 */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 #include <ctype.h>
 
 

source/lib/ldb/common/ldb_modules.c

@@ -34,6 +34,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 #include "dlinklist.h"
 #include <sys/types.h> 
 #include <sys/stat.h> 
@@ -82,10 +84,10 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 
 	if (!modules && strcmp("ldap", ldb->modules->ops->name)) { /* no modules in the options, look for @MODULES in the db (not for ldap) */
 		int ret, j, k;
-		char * attrs[] = { "@MODULE" };
+		const char * const attrs[] = { "@MODULE" , NULL};
 		struct ldb_message **msg;
 
-		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", (const char * const *)attrs, &msg);
+		ret = ldb_search(ldb, "", LDB_SCOPE_BASE, "dn=@MODULES", attrs, &msg);
 		if (ret == 0) {
 			ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
 		} else {
@@ -144,7 +146,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 #ifdef HAVE_DLOPEN_DISABLED
 		{
 			void *handle;
-			init_ldb_module_function init;
+			ldb_module_init_function init;
 			struct stat st;
 			const char *errstr;
 
@@ -160,7 +162,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
 				return -1;
 			}
 
-			init = (init_ldb_module_function)dlsym(handle, "init_module");
+			init = (ldb_module_init_function)dlsym(handle, "init_module");
 
 			errstr = dlerror();
 			if (errstr) {

source/lib/ldb/common/ldb_msg.c

@@ -33,6 +33,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 
 
 /*
@@ -83,6 +85,31 @@ struct ldb_val *ldb_msg_find_val(const struct ldb_message_element *el,
 	return NULL;
 }
 
+/*
+  duplicate a ldb_val structure
+*/
+struct ldb_val ldb_val_dup(struct ldb_context *ldb,
+			   const struct ldb_val *v)
+{
+	struct ldb_val v2;
+	v2.length = v->length;
+	if (v->length == 0) {
+		v2.data = NULL;
+		return v2;
+	}
+
+	/* the +1 is to cope with buggy C library routines like strndup
+	   that look one byte beyond */
+	v2.data = ldb_malloc(ldb, v->length+1);
+	if (!v2.data) {
+		v2.length = 0;
+		return v2;
+	}
+
+	memcpy(v2.data, v->data, v->length);
+	((char *)v2.data)[v->length] = 0;
+	return v2;
+}
 
 /*
   add an empty element to a message

source/lib/ldb/common/ldb_parse.c

@@ -42,6 +42,8 @@
 */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 #include "ldb/include/ldb_parse.h"
 #include <ctype.h>
 

source/lib/ldb/common/ldb_utf8.c

@@ -33,6 +33,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 #include <ctype.h>
 
 /*

source/lib/ldb/common/util.c

@@ -33,6 +33,8 @@
  */
 
 #include "includes.h"
+#include "ldb/include/ldb.h"
+#include "ldb/include/ldb_private.h"
 
 
 /*