From c43505b621725c9a754f0ee98318d451b093f2ed Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 12 Jul 2012 15:55:21 +0200 Subject: s3: rename sid_check_is_domain() to sid_check_is_our_sam() This does not check whether the given sid is the domain sid, but whether it is the sid of the local sam, which is different for a domain member server. --- source3/rpc_server/samr/srv_samr_nt.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/rpc_server/samr') diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c index 8dcc7ad3a2..2363fd434b 100644 --- a/source3/rpc_server/samr/srv_samr_nt.c +++ b/source3/rpc_server/samr/srv_samr_nt.c @@ -233,7 +233,7 @@ static DISP_INFO *get_samr_dispinfo_by_sid(const struct dom_sid *psid) return builtin_dispinfo; } - if (sid_check_is_domain(psid) || sid_check_is_in_our_domain(psid)) { + if (sid_check_is_our_sam(psid) || sid_check_is_in_our_domain(psid)) { /* * Necessary only once, but it does not really hurt. */ @@ -484,7 +484,7 @@ NTSTATUS _samr_OpenDomain(struct pipes_struct *p, if ( !NT_STATUS_IS_OK(status) ) return status; - if (!sid_check_is_domain(r->in.sid) && + if (!sid_check_is_our_sam(r->in.sid) && !sid_check_is_builtin(r->in.sid)) { return NT_STATUS_NO_SUCH_DOMAIN; } @@ -5326,7 +5326,7 @@ NTSTATUS _samr_GetAliasMembership(struct pipes_struct *p, return status; } - if (!sid_check_is_domain(&dinfo->sid) && + if (!sid_check_is_our_sam(&dinfo->sid) && !sid_check_is_builtin(&dinfo->sid)) return NT_STATUS_OBJECT_TYPE_MISMATCH; @@ -5837,7 +5837,7 @@ NTSTATUS _samr_CreateDomainGroup(struct pipes_struct *p, return status; } - if (!sid_check_is_domain(&dinfo->sid)) { + if (!sid_check_is_our_sam(&dinfo->sid)) { return NT_STATUS_ACCESS_DENIED; } @@ -5899,7 +5899,7 @@ NTSTATUS _samr_CreateDomAlias(struct pipes_struct *p, return result; } - if (!sid_check_is_domain(&dinfo->sid)) { + if (!sid_check_is_our_sam(&dinfo->sid)) { return NT_STATUS_ACCESS_DENIED; } @@ -6319,7 +6319,7 @@ NTSTATUS _samr_OpenGroup(struct pipes_struct *p, /* this should not be hard-coded like this */ - if (!sid_check_is_domain(&dinfo->sid)) { + if (!sid_check_is_our_sam(&dinfo->sid)) { return NT_STATUS_ACCESS_DENIED; } -- cgit