diff options
| author | Michael Adam <obnox@samba.org> | 2012-07-12 16:00:59 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-07-12 18:36:02 +0200 |
| commit | 1ee95e4cb14b0f9c7bbaba0c994f0a511822cff8 (patch) | |
| tree | f6e37fee3351a8c09bbaa0ee3a4395e1bec69371 /source3/rpc_server | |
| parent | c43505b621725c9a754f0ee98318d451b093f2ed (diff) | |
| download | samba-1ee95e4cb14b0f9c7bbaba0c994f0a511822cff8.tar.gz samba-1ee95e4cb14b0f9c7bbaba0c994f0a511822cff8.tar.bz2 samba-1ee95e4cb14b0f9c7bbaba0c994f0a511822cff8.zip | |
s3: rename sid_check_is_in_our_domain() to sid_check_is_in_our_sam()
This does not check whether the given sid is in our domain, but
but whether it belongs to the local sam, which is a different
thing on a domain member server.
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Thu Jul 12 18:36:02 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/samr/srv_samr_nt.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c index 2363fd434b..d7cebb4535 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_our_sam(psid) || sid_check_is_in_our_domain(psid)) { + if (sid_check_is_our_sam(psid) || sid_check_is_in_our_sam(psid)) { /* * Necessary only once, but it does not really hurt. */ @@ -525,7 +525,7 @@ NTSTATUS _samr_GetUserPwInfo(struct pipes_struct *p, return status; } - if (!sid_check_is_in_our_domain(&uinfo->sid)) { + if (!sid_check_is_in_our_sam(&uinfo->sid)) { return NT_STATUS_OBJECT_TYPE_MISMATCH; } @@ -3010,7 +3010,7 @@ NTSTATUS _samr_QueryUserInfo(struct pipes_struct *p, sid_split_rid(&domain_sid, &rid); - if (!sid_check_is_in_our_domain(&uinfo->sid)) + if (!sid_check_is_in_our_sam(&uinfo->sid)) return NT_STATUS_OBJECT_TYPE_MISMATCH; DEBUG(5,("_samr_QueryUserInfo: sid:%s\n", @@ -3183,7 +3183,7 @@ NTSTATUS _samr_GetGroupsForUser(struct pipes_struct *p, return NT_STATUS_NO_MEMORY; } - if (!sid_check_is_in_our_domain(&uinfo->sid)) + if (!sid_check_is_in_our_sam(&uinfo->sid)) return NT_STATUS_OBJECT_TYPE_MISMATCH; if ( !(sam_pass = samu_new( p->mem_ctx )) ) { @@ -5455,7 +5455,7 @@ NTSTATUS _samr_QueryGroupMember(struct pipes_struct *p, DEBUG(10, ("sid is %s\n", sid_string_dbg(&ginfo->sid))); - if (!sid_check_is_in_our_domain(&ginfo->sid)) { + if (!sid_check_is_in_our_sam(&ginfo->sid)) { DEBUG(3, ("sid %s is not in our domain\n", sid_string_dbg(&ginfo->sid))); return NT_STATUS_NO_SUCH_GROUP; @@ -5666,7 +5666,7 @@ NTSTATUS _samr_DeleteUser(struct pipes_struct *p, return status; } - if (!sid_check_is_in_our_domain(&uinfo->sid)) + if (!sid_check_is_in_our_sam(&uinfo->sid)) return NT_STATUS_CANNOT_DELETE; /* check if the user exists before trying to delete */ @@ -5792,7 +5792,7 @@ NTSTATUS _samr_DeleteDomAlias(struct pipes_struct *p, return NT_STATUS_SPECIAL_ACCOUNT; } - if (!sid_check_is_in_our_domain(&ainfo->sid)) + if (!sid_check_is_in_our_sam(&ainfo->sid)) return NT_STATUS_NO_SUCH_ALIAS; DEBUG(10, ("lookup on Local SID\n")); |