From d4939ce4fc5e61c96e047b6a61a5502335da8926 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 28 Sep 2010 10:39:52 -0700 Subject: s4-drs: moved the drs_ObjectIdentifier handling to dsdb_dn.c this will be used outside of the drs server. This also fixes the handling of the ndr_size elements of the drs_ObjectIdentifier --- source4/rpc_server/drsuapi/drsutil.c | 44 ------------------------------------ 1 file changed, 44 deletions(-) (limited to 'source4/rpc_server/drsuapi/drsutil.c') diff --git a/source4/rpc_server/drsuapi/drsutil.c b/source4/rpc_server/drsuapi/drsutil.c index 5b5e14aea4..f88af93354 100644 --- a/source4/rpc_server/drsuapi/drsutil.c +++ b/source4/rpc_server/drsuapi/drsutil.c @@ -26,50 +26,6 @@ #include "param/param.h" #include "auth/session.h" -/* - format a drsuapi_DsReplicaObjectIdentifier naming context as a string - */ -char *drs_ObjectIdentifier_to_string(TALLOC_CTX *mem_ctx, - struct drsuapi_DsReplicaObjectIdentifier *nc) -{ - char *guid, *sid, *ret; - guid = GUID_string(mem_ctx, &nc->guid); - sid = dom_sid_string(mem_ctx, &nc->sid); - ret = talloc_asprintf(mem_ctx, ";;%s", - guid, sid, nc->dn); - talloc_free(guid); - talloc_free(sid); - return ret; -} - -struct ldb_dn *drs_ObjectIdentifier_to_dn(TALLOC_CTX *mem_ctx, - struct ldb_context *ldb, - struct drsuapi_DsReplicaObjectIdentifier *nc) -{ - char *guid = NULL, *sid = NULL, *ret = NULL; - struct ldb_dn *new_dn; - if (!GUID_all_zero(&nc->guid)) { - guid = GUID_string(mem_ctx, &nc->guid); - if (guid) { - ret = talloc_asprintf_append(mem_ctx, ";", guid); - } - } - if (nc->sid.sid_rev_num != 0) { - sid = dom_sid_string(mem_ctx, &nc->sid); - if (sid) { - ret = talloc_asprintf_append(ret, ";", sid); - } - } - if (nc->dn) { - ret = talloc_asprintf_append(ret, "%s", nc->dn); - } - new_dn = ldb_dn_new(mem_ctx, ldb, ret); - talloc_free(guid); - talloc_free(sid); - talloc_free(ret); - return new_dn; -} - int drsuapi_search_with_extended_dn(struct ldb_context *ldb, TALLOC_CTX *mem_ctx, struct ldb_result **_res, -- cgit