From 102a70e809b262fca8ea09fbd4e2788511150006 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 26 Aug 2010 17:21:39 +0200
Subject: s3-util: use shared dom_sid_dup.

Guenther
---
 source3/rpc_server/srv_lsa_nt.c    | 12 ++++++------
 source3/rpc_server/srv_netlog_nt.c |  3 ++-
 source3/rpc_server/srv_samr_nt.c   |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'source3/rpc_server')

diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 02cb578671..191cdfeb66 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -117,7 +117,7 @@ static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
 	ZERO_STRUCT(ref->domains[num]);
 
 	init_lsa_StringLarge(&ref->domains[num].name, dom_name);
-	ref->domains[num].sid = sid_dup_talloc(mem_ctx, dom_sid);
+	ref->domains[num].sid = dom_sid_dup(mem_ctx, dom_sid);
 	if (!ref->domains[num].sid) {
 		return -1;
 	}
@@ -307,7 +307,7 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 
 		/* Initialize the lsa_TranslatedSid3 return. */
 		trans_sids[i].sid_type = type;
-		trans_sids[i].sid = sid_dup_talloc(mem_ctx, &sid);
+		trans_sids[i].sid = dom_sid_dup(mem_ctx, &sid);
 		trans_sids[i].sid_index = dom_idx;
 	}
 
@@ -654,7 +654,7 @@ NTSTATUS _lsa_QueryInfoPolicy(struct pipes_struct *p,
 			case ROLE_DOMAIN_PDC:
 			case ROLE_DOMAIN_BDC:
 				name = get_global_sam_name();
-				sid = sid_dup_talloc(p->mem_ctx, get_global_sam_sid());
+				sid = dom_sid_dup(p->mem_ctx, get_global_sam_sid());
 				if (!sid) {
 					return NT_STATUS_NO_MEMORY;
 				}
@@ -663,7 +663,7 @@ NTSTATUS _lsa_QueryInfoPolicy(struct pipes_struct *p,
 				name = lp_workgroup();
 				/* We need to return the Domain SID here. */
 				if (secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
-					sid = sid_dup_talloc(p->mem_ctx, &domain_sid);
+					sid = dom_sid_dup(p->mem_ctx, &domain_sid);
 					if (!sid) {
 						return NT_STATUS_NO_MEMORY;
 					}
@@ -1606,7 +1606,7 @@ NTSTATUS _lsa_EnumAccounts(struct pipes_struct *p,
 		}
 
 		for (i = *r->in.resume_handle, j = 0; i < num_entries; i++, j++) {
-			sids[j].sid = sid_dup_talloc(p->mem_ctx, &sid_list[i]);
+			sids[j].sid = dom_sid_dup(p->mem_ctx, &sid_list[i]);
 			if (!sids[j].sid) {
 				talloc_free(sid_list);
 				return NT_STATUS_NO_MEMORY;
@@ -2428,7 +2428,7 @@ NTSTATUS _lsa_EnumAccountsWithUserRight(struct pipes_struct *p,
 					 r->out.sids->num_sids);
 
 	for (i=0; i < r->out.sids->num_sids; i++) {
-		r->out.sids->sids[i].sid = sid_dup_talloc(r->out.sids->sids,
+		r->out.sids->sids[i].sid = dom_sid_dup(r->out.sids->sids,
 							  &sids[i]);
 		if (!r->out.sids->sids[i].sid) {
 			TALLOC_FREE(r->out.sids->sids);
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 4b692b36fc..76da1d00d6 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -36,6 +36,7 @@
 #include "../lib/crypto/md4.h"
 #include "rpc_client/init_lsa.h"
 #include "rpc_server/rpc_ncacn_np.h"
+#include "../libcli/security/dom_sid.h"
 
 extern userdom_struct current_user_info;
 
@@ -909,7 +910,7 @@ NTSTATUS _netr_ServerAuthenticate3(struct pipes_struct *p,
 		goto out;
 	}
 
-	creds->sid = sid_dup_talloc(creds, &sid);
+	creds->sid = dom_sid_dup(creds, &sid);
 	if (!creds->sid) {
 		status = NT_STATUS_NO_MEMORY;
 		goto out;
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 40790cfc18..994fc7934b 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5473,7 +5473,7 @@ NTSTATUS _samr_GetMembersInAlias(struct pipes_struct *p,
 	}
 
 	for (i = 0; i < num_sids; i++) {
-		sids[i].sid = sid_dup_talloc(p->mem_ctx, &pdb_sids[i]);
+		sids[i].sid = dom_sid_dup(p->mem_ctx, &pdb_sids[i]);
 		if (!sids[i].sid) {
 			TALLOC_FREE(pdb_sids);
 			return NT_STATUS_NO_MEMORY;
@@ -6736,7 +6736,7 @@ NTSTATUS _samr_RidToSid(struct pipes_struct *p,
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	*r->out.sid = sid_dup_talloc(p->mem_ctx, &sid);
+	*r->out.sid = dom_sid_dup(p->mem_ctx, &sid);
 	if (!*r->out.sid) {
 		return NT_STATUS_NO_MEMORY;
 	}
-- 
cgit