r10913: This patch isn't as big as it looks ...

most of the changes are fixes to make all the ldb code compile without
warnings on gcc4. Unfortunately That required a lot of casts :-(

I have also added the start of an 'operational' module, which will
replace the timestamp module, plus add support for some other
operational attributes

In ldb_msg_*() I added some new utility functions to make the
operational module sane, and remove the 'ldb' argument from the
ldb_msg_add_*() functions. That argument was only needed back in the
early days of ldb when we didn't use the hierarchical talloc and thus
needed a place to get the allocation function from. Now its just a
pain to pass around everywhere.

Also added a ldb_debug_set() function that calls ldb_debug() plus sets
the result using ldb_set_errstring(). That saves on some awkward
coding in a few places.
(This used to be commit f6818daecca95760c12f79fd307770cbe3346f57)

1 files changed, 6 insertions, 6 deletions

diff --git a/source4/lib/ldb/tools/oLschema2ldif.c b/source4/lib/ldb/tools/oLschema2ldif.c
index 4e1607f314..0fcd531987 100644
--- a/source4/lib/ldb/tools/oLschema2ldif.c
+++ b/source4/lib/ldb/tools/oLschema2ldif.c
@@ -123,7 +123,7 @@ static char *skip_spaces(char *string) {
 	return (string + strspn(string, " \t\n"));
 }
 
-static int add_multi_string(struct ldb_context *ldb, struct ldb_message *msg, const char *attr, char *values)
+static int add_multi_string(struct ldb_message *msg, const char *attr, char *values)
 {
 	char *c;
 	char *s;
@@ -133,7 +133,7 @@ static int add_multi_string(struct ldb_context *ldb, struct ldb_message *msg, co
 	while (*c) {
 		n = strcspn(c, " \t$");
 		s = talloc_strndup(msg, c, n);
-		if (ldb_msg_add_string(ldb, msg, attr, s) != 0) {
+		if (ldb_msg_add_string(msg, attr, s) != 0) {
 			return -1;
 		}
 		c += n;
@@ -143,8 +143,8 @@ static int add_multi_string(struct ldb_context *ldb, struct ldb_message *msg, co
 	return 0;
 }
 
-#define MSG_ADD_STRING(a, v) do { if (ldb_msg_add_string(ldb_ctx, msg, a, v) != 0) goto failed; } while(0)
-#define MSG_ADD_M_STRING(a, v) do { if (add_multi_string(ldb_ctx, msg, a, v) != 0) goto failed; } while(0)
+#define MSG_ADD_STRING(a, v) do { if (ldb_msg_add_string(msg, a, v) != 0) goto failed; } while(0)
+#define MSG_ADD_M_STRING(a, v) do { if (add_multi_string(msg, a, v) != 0) goto failed; } while(0)
 
 static char *get_def_value(TALLOC_CTX *ctx, char **string)
 {
@@ -373,7 +373,7 @@ static struct ldb_message *process_entry(TALLOC_CTX *mem_ctx, const char *entry)
 	ctx = talloc_new(mem_ctx);
 	msg = ldb_msg_new(ctx);
 
-	ldb_msg_add_string(ldb_ctx, msg, "objectClass", "top");
+	ldb_msg_add_string(msg, "objectClass", "top");
 
 	c = talloc_strdup(ctx, entry);
 	if (!c) return NULL;
@@ -488,7 +488,7 @@ failed:
 	return NULL;
 }
 
-static const struct schema_conv process_file(FILE *in, FILE *out)
+static struct schema_conv process_file(FILE *in, FILE *out)
 {
 	TALLOC_CTX *ctx;
 	struct schema_conv ret;