1 files changed, 8 insertions, 7 deletions

diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index e457bd4ae7..690838d779 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "../lib/crypto/arcfour.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "../libcli/security/dom_sid.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
@@ -229,7 +230,7 @@ static NTSTATUS append_netr_SidAttr(TALLOC_CTX *mem_ctx,
 	if (*sids == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
-	(*sids)[t].sid = sid_dup_talloc(*sids, asid);
+	(*sids)[t].sid = dom_sid_dup(*sids, asid);
 	if ((*sids)[t].sid == NULL) {
 		return NT_STATUS_NO_MEMORY;
 	}
@@ -332,7 +333,7 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx,
 
 	/* check if this is a "Unix Users" domain user,
 	 * we need to handle it in a special way if that's the case */
-	if (sid_compare_domain(user_sid, &global_sid_Unix_Users) == 0) {
+	if (dom_sid_compare_domain(user_sid, &global_sid_Unix_Users) == 0) {
 		/* in info3 you can only set rids for the user and the
 		 * primary group, and the domain sid must be that of
 		 * the sam domain.
@@ -358,7 +359,7 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx,
 
 	/* check if this is a "Unix Groups" domain group,
 	 * if so we need special handling */
-	if (sid_compare_domain(group_sid, &global_sid_Unix_Groups) == 0) {
+	if (dom_sid_compare_domain(group_sid, &global_sid_Unix_Groups) == 0) {
 		/* in info3 you can only set rids for the user and the
 		 * primary group, and the domain sid must be that of
 		 * the sam domain.
@@ -467,7 +468,7 @@ NTSTATUS samu_to_SamInfo3(TALLOC_CTX *mem_ctx,
 						  pdb_get_domain(samu));
 	RET_NOMEM(info3->base.domain.string);
 
-	info3->base.domain_sid = sid_dup_talloc(info3, &domain_sid);
+	info3->base.domain_sid = dom_sid_dup(info3, &domain_sid);
 	RET_NOMEM(info3->base.domain_sid);
 
 	info3->base.acct_flags = pdb_get_acct_ctrl(samu);
@@ -547,7 +548,7 @@ struct netr_SamInfo3 *copy_netr_SamInfo3(TALLOC_CTX *mem_ctx,
 	}
 
 	if (orig->base.domain_sid) {
-		info3->base.domain_sid = sid_dup_talloc(info3, orig->base.domain_sid);
+		info3->base.domain_sid = dom_sid_dup(info3, orig->base.domain_sid);
 		RET_NOMEM(info3->base.domain_sid);
 	}
 
@@ -557,7 +558,7 @@ struct netr_SamInfo3 *copy_netr_SamInfo3(TALLOC_CTX *mem_ctx,
 					   orig->sidcount);
 		RET_NOMEM(info3->sids);
 		for (i = 0; i < orig->sidcount; i++) {
-			info3->sids[i].sid = sid_dup_talloc(info3->sids,
+			info3->sids[i].sid = dom_sid_dup(info3->sids,
 							    orig->sids[i].sid);
 			RET_NOMEM(info3->sids[i].sid);
 			info3->sids[i].attributes =
@@ -694,7 +695,7 @@ struct netr_SamInfo3 *wbcAuthUserInfo_to_netr_SamInfo3(TALLOC_CTX *mem_ctx,
 		RET_NOMEM(info3->base.domain.string);
 	}
 
-	info3->base.domain_sid = sid_dup_talloc(info3, &domain_sid);
+	info3->base.domain_sid = dom_sid_dup(info3, &domain_sid);
 	RET_NOMEM(info3->base.domain_sid);
 
 	memcpy(info3->base.LMSessKey.key, info->lm_session_key, 8);