From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 15 Feb 2010 06:38:16 +0000 (+1100)
Subject: s4-dsdb: added dsdb_modify_permissive()
X-Git-Tag: samba-3.6.0pre1~5306
X-Git-Url: http://git.samba.org/samba.git/?p=samba.git;a=commitdiff_plain;h=4694b4677ac58cd99d005d33aaf8c1b154e63b29

s4-dsdb: added dsdb_modify_permissive()

This will be used in the drsuapi server
---

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index d659767138f..eb021dfc949 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -3360,3 +3360,39 @@ int dsdb_load_udv_v1(struct ldb_context *samdb, struct ldb_dn *dn, TALLOC_CTX *m
 	talloc_free(v2);
 	return LDB_SUCCESS;
 }
+
+
+/*
+  a modify with the 'permissive' control
+  this means no error for entries that already exist on adds, or
+  removal of entries that don't exist
+*/
+int dsdb_modify_permissive(struct ldb_context *ldb,
+			   const struct ldb_message *message)
+{
+	struct ldb_request *req;
+	int ret;
+
+	ret = ldb_build_mod_req(&req, ldb, ldb,
+				message,
+				NULL,
+				NULL,
+				ldb_op_default_callback,
+				NULL);
+
+	if (ret != LDB_SUCCESS) return ret;
+
+	ret = ldb_request_add_control(req, LDB_CONTROL_PERMISSIVE_MODIFY_OID, false, NULL);
+	if (ret != LDB_SUCCESS) {
+		talloc_free(req);
+		return ret;
+	}
+
+	ret = ldb_request(ldb, req);
+	if (ret == LDB_SUCCESS) {
+		ret = ldb_wait(req->handle, LDB_WAIT_ALL);
+	}
+
+	talloc_free(req);
+	return ret;
+}