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)

4 files changed, 24 insertions, 23 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c
index 7dc6a433c0d..70bbaf179ce 100644
--- a/source4/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source4/dsdb/samdb/ldb_modules/objectguid.c
@@ -101,7 +101,7 @@ static int objectguid_add_record(struct ldb_module *module, const struct ldb_mes
 		return -1;
 	}
 
-	ret = ldb_msg_add_value(module->ldb, msg2, "objectGUID", &v);
+	ret = ldb_msg_add_value(msg2, "objectGUID", &v);
 	if (ret) {
 		return ret;
 	}
diff --git a/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c
index a68f6f06405..5e88cd64699 100644
--- a/source4/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source4/dsdb/samdb/ldb_modules/samba3sam.c
@@ -55,17 +55,17 @@ static void generate_hashes (struct ldb_module *module, const char *local_attr,
 	if (!upwd)
 		return;
 
-	ldb_msg_add_string(module->ldb, remote_fb, local_attr, upwd);
+	ldb_msg_add_string(remote_fb, local_attr, upwd);
 
 	val.length = 16;
 	val.data = talloc_zero_size(module, val.length);
 
 	E_md4hash(upwd, val.data);
-	ldb_msg_add_value(module->ldb, remote_mp, "sambaNTPassword", &val);
+	ldb_msg_add_value(remote_mp, "sambaNTPassword", &val);
 			
 	val.data = talloc_zero_size(module, val.length);
 	E_deshash(upwd, val.data);
-	ldb_msg_add_value(module->ldb, remote_mp, "sambaLMPassword", &val);
+	ldb_msg_add_value(remote_mp, "sambaLMPassword", &val);
 }
 
 
@@ -119,7 +119,7 @@ static void generate_sambaPrimaryGroupSID(struct ldb_module *module, const char
 
 	sidstring = dom_sid_string(remote_mp, sid);
 	talloc_free(sid);
-	ldb_msg_add_fmt(module->ldb, remote_mp, "sambaPrimaryGroupSID", "%s-%d", sidstring, ldb_msg_find_uint(local, "primaryGroupID", 0));
+	ldb_msg_add_fmt(remote_mp, "sambaPrimaryGroupSID", "%s-%d", sidstring, ldb_msg_find_uint(local, "primaryGroupID", 0));
 	talloc_free(sidstring);
 }
 
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 906a2299f7e..5ed84cc10d3 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -107,17 +107,17 @@ static int samldb_allocate_next_rid(struct ldb_context *ldb, TALLOC_CTX *mem_ctx
 	els[1].flags = LDB_FLAG_MOD_ADD;
 	els[1].name = els[0].name;
 
-	vals[0].data = talloc_asprintf(mem_ctx, "%u", *id);
+	vals[0].data = (uint8_t *)talloc_asprintf(mem_ctx, "%u", *id);
 	if (!vals[0].data) {
 		return -1;
 	}
-	vals[0].length = strlen(vals[0].data);
+	vals[0].length = strlen((char *)vals[0].data);
 
-	vals[1].data = talloc_asprintf(mem_ctx, "%u", (*id)+1);
+	vals[1].data = (uint8_t *)talloc_asprintf(mem_ctx, "%u", (*id)+1);
 	if (!vals[1].data) {
 		return -1;
 	}
-	vals[1].length = strlen(vals[1].data);
+	vals[1].length = strlen((char *)vals[1].data);
 
 	ret = ldb_modify(ldb, &msg);
 	if (ret != 0) {
@@ -240,7 +240,8 @@ static struct ldb_message_element *samldb_find_attribute(const struct ldb_messag
 				return &msg->elements[i];
 			}
 			for (j = 0; j < msg->elements[i].num_values; j++) {
-				if (strcasecmp(value, msg->elements[i].values[j].data) == 0) {
+				if (strcasecmp(value, 
+					       (char *)msg->elements[i].values[j].data) == 0) {
 					return &msg->elements[i];
 				}
 			}
@@ -260,7 +261,7 @@ static BOOL samldb_msg_add_string(struct ldb_module *module, struct ldb_message
 		return False;
 	}
 
-	if (ldb_msg_add_string(module->ldb, msg, aname, aval) != 0) {
+	if (ldb_msg_add_string(msg, aname, aval) != 0) {
 		return False;
 	}
 
@@ -276,7 +277,7 @@ static BOOL samldb_msg_add_sid(struct ldb_module *module, struct ldb_message *ms
 	if (!NT_STATUS_IS_OK(status)) {
 		return -1;
 	}
-	return (ldb_msg_add_value(module->ldb, msg, name, &v) == 0);
+	return (ldb_msg_add_value(msg, name, &v) == 0);
 }
 
 static BOOL samldb_find_or_add_attribute(struct ldb_module *module, struct ldb_message *msg, const char *name, const char *value, const char *set_value)
@@ -497,7 +498,7 @@ static struct ldb_message *samldb_fill_foreignSecurityPrincipal_object(struct ld
 	}
 
 	if ((attribute = samldb_find_attribute(msg2, "objectSid", NULL)) == NULL ) {
-		struct dom_sid *sid = dom_sid_parse_talloc(msg2, rdn->value.data);
+		struct dom_sid *sid = dom_sid_parse_talloc(msg2, (char *)rdn->value.data);
 		if (sid == NULL) {
 			ldb_debug(module->ldb, LDB_DEBUG_FATAL, "samldb_fill_foreignSecurityPrincipal_object: internal error! Can't parse sid in CN\n");
 			return NULL;
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index bc8dcd0f068..6afa83e1aa0 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -699,7 +699,7 @@ int samdb_msg_add_string(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struc
 	if (s == NULL || a == NULL) {
 		return -1;
 	}
-	return ldb_msg_add_string(sam_ldb, msg, a, s);
+	return ldb_msg_add_string(msg, a, s);
 }
 
 /*
@@ -715,7 +715,7 @@ int samdb_msg_add_dom_sid(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, stru
 	if (!NT_STATUS_IS_OK(status)) {
 		return -1;
 	}
-	return ldb_msg_add_value(sam_ldb, msg, attr_name, &v);
+	return ldb_msg_add_value(msg, attr_name, &v);
 }
 
 
@@ -731,7 +731,7 @@ int samdb_msg_add_delete(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struc
 	}
 	/* we use an empty replace rather than a delete, as it allows for 
 	   samdb_replace() to be used everywhere */
-	return ldb_msg_add_empty(sam_ldb, msg, a, LDB_FLAG_MOD_REPLACE);
+	return ldb_msg_add_empty(msg, a, LDB_FLAG_MOD_REPLACE);
 }
 
 /*
@@ -749,7 +749,7 @@ int samdb_msg_add_addval(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struc
 	v = talloc_strdup(mem_ctx, value);
 	if (v == NULL)
 		return -1;
-	ret = ldb_msg_add_string(sam_ldb, msg, a, v);
+	ret = ldb_msg_add_string(msg, a, v);
 	if (ret != 0)
 		return ret;
 	el = ldb_msg_find_element(msg, a);
@@ -774,7 +774,7 @@ int samdb_msg_add_delval(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struc
 	v = talloc_strdup(mem_ctx, value);
 	if (v == NULL)
 		return -1;
-	ret = ldb_msg_add_string(sam_ldb, msg, a, v);
+	ret = ldb_msg_add_string(msg, a, v);
 	if (ret != 0)
 		return ret;
 	el = ldb_msg_find_element(msg, a);
@@ -826,7 +826,7 @@ int samdb_msg_add_hash(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct
 		return -1;
 	}
 	val.length = 16;
-	return ldb_msg_add_value(sam_ldb, msg, attr_name, &val);
+	return ldb_msg_add_value(msg, attr_name, &val);
 }
 
 /*
@@ -845,7 +845,7 @@ int samdb_msg_add_hashes(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struc
 	for (i=0;i<count;i++) {
 		memcpy(i*16 + (char *)val.data, hashes[i].hash, 16);
 	}
-	return ldb_msg_add_value(sam_ldb, msg, attr_name, &val);
+	return ldb_msg_add_value(msg, attr_name, &val);
 }
 
 /*
@@ -866,7 +866,7 @@ int samdb_msg_add_logon_hours(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx,
 	struct ldb_val val;
 	val.length = hours->units_per_week / 8;
 	val.data = hours->bits;
-	return ldb_msg_add_value(sam_ldb, msg, attr_name, &val);
+	return ldb_msg_add_value(msg, attr_name, &val);
 }
 
 /*
@@ -875,7 +875,7 @@ int samdb_msg_add_logon_hours(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx,
 int samdb_msg_add_value(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
 			      const char *attr_name, const struct ldb_val *val)
 {
-	return ldb_msg_add_value(sam_ldb, msg, attr_name, val);
+	return ldb_msg_add_value(msg, attr_name, val);
 }
 
 /*
@@ -890,7 +890,7 @@ int samdb_msg_set_value(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct
 	if (el) {
 		el->num_values = 0;
 	}
-	return ldb_msg_add_value(sam_ldb, msg, attr_name, val);
+	return ldb_msg_add_value(msg, attr_name, val);
 }
 
 /*