r8669: The objectguid module belongs in Samba's ldb module collection, not in

ldb, as it can't build without the NDR and GUID code.

Also make it properly use the NDR encoding for the GUID (I forgot last
time, and used a string), as well as set the dependencies on the
module correctly.

Andrew Bartlett
(This used to be commit 8054abc76e5e3588cebc7fc01062a1223b7f140b)

1 files changed, 0 insertions, 14 deletions

diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index fd542c5567..448e4292aa 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -978,20 +978,6 @@ int samdb_msg_set_ldaptime(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, str
 */
 int samdb_add(struct ldb_context *sam_ldb, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
 {
-	int ret;
-	struct ldb_val v;
-	NTSTATUS status;
-	struct GUID guid = GUID_random();
-
-	status = ndr_push_struct_blob(&v, mem_ctx, &guid, 
-				      (ndr_push_flags_fn_t)ndr_push_GUID);
-	if (!NT_STATUS_IS_OK(status)) {
-		return -1;
-	}
-
-	ret = ldb_msg_add_value(sam_ldb, msg, "objectGUID", &v);
-	if (ret != 0) return ret;
-
 	return ldb_add(sam_ldb, msg);
 }