From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Thu, 14 Oct 2010 19:54:51 +0000 (+0200)
Subject: s4:dsdb - remove "samdb_msg_add_value"
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=9bc57e19e61ca89c349c28dda727d7e181dcc6e2;p=abartlet%2Fsamba.git%2F.git

s4:dsdb - remove "samdb_msg_add_value"

This can be substituted by "ldb_msg_add_value".

Signed-off-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Oct 15 00:21:53 UTC 2010 on sn-devel-104
---

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 1b732c2a338..18a8669f29b 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -1026,14 +1026,6 @@ int samdb_msg_add_parameters(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, s
 	val.data = (uint8_t *)parameters->array;
 	return ldb_msg_add_value(msg, attr_name, &val, NULL);
 }
-/*
-  add a general value element to a message
-*/
-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(msg, attr_name, val, NULL);
-}
 
 /*
   sets a general value element to a message
@@ -2094,8 +2086,8 @@ NTSTATUS samdb_set_password(struct ldb_context *ldb, TALLOC_CTX *mem_ctx,
 	if ((new_password != NULL)
 			&& ((lmNewHash == NULL) && (ntNewHash == NULL))) {
 		/* we have the password as plaintext UTF16 */
-		CHECK_RET(samdb_msg_add_value(ldb, mem_ctx, msg,
-			"clearTextPassword", new_password));
+		CHECK_RET(ldb_msg_add_value(msg, "clearTextPassword",
+					    new_password, NULL));
 		el = ldb_msg_find_element(msg, "clearTextPassword");
 		el->flags = LDB_FLAG_MOD_REPLACE;
 	} else if ((new_password == NULL)
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index ac048ee63b1..1adfc08f6da 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -3139,8 +3139,7 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
 		val.length = secret.length;
 		
 		/* set value */
-		if (samdb_msg_add_value(secret_state->sam_ldb, 
-					mem_ctx, msg, "priorValue", &val) != LDB_SUCCESS) {
+		if (ldb_msg_add_value(msg, "priorValue", &val, NULL) != LDB_SUCCESS) {
 			return NT_STATUS_NO_MEMORY; 
 		}
 		
@@ -3180,9 +3179,8 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
 		
 		if (old_val) {
 			/* set old value */
-			if (samdb_msg_add_value(secret_state->sam_ldb, 
-						mem_ctx, msg, "priorValue", 
-						old_val) != 0) {
+			if (ldb_msg_add_value(msg, "priorValue",
+					      old_val, NULL) != LDB_SUCCESS) {
 				return NT_STATUS_NO_MEMORY; 
 			}
 		} else {
@@ -3221,8 +3219,7 @@ static NTSTATUS dcesrv_lsa_SetSecret(struct dcesrv_call_state *dce_call, TALLOC_
 		val.length = secret.length;
 		
 		/* set value */
-		if (samdb_msg_add_value(secret_state->sam_ldb, 
-					mem_ctx, msg, "currentValue", &val) != LDB_SUCCESS) {
+		if (ldb_msg_add_value(msg, "currentValue", &val, NULL) != LDB_SUCCESS) {
 			return NT_STATUS_NO_MEMORY; 
 		}