From 1ee95e4cb14b0f9c7bbaba0c994f0a511822cff8 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 12 Jul 2012 16:00:59 +0200 Subject: 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 Autobuild-Date(master): Thu Jul 12 18:36:02 CEST 2012 on sn-devel-104 --- source3/winbindd/idmap.c | 2 +- source3/winbindd/wb_lookupsids.c | 2 +- source3/winbindd/winbindd_samr.c | 4 ++-- source3/winbindd/winbindd_util.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c index 6ae10115b7..b2362103d8 100644 --- a/source3/winbindd/idmap.c +++ b/source3/winbindd/idmap.c @@ -510,7 +510,7 @@ NTSTATUS idmap_backends_sid_to_unixid(const char *domain, struct id_map *id) maps[1] = NULL; if (sid_check_is_in_builtin(id->sid) - || (sid_check_is_in_our_domain(id->sid))) + || (sid_check_is_in_our_sam(id->sid))) { NTSTATUS status; diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c index 4da2629d10..2c4ebda3eb 100644 --- a/source3/winbindd/wb_lookupsids.c +++ b/source3/winbindd/wb_lookupsids.c @@ -255,7 +255,7 @@ static bool wb_lookupsids_bulk(const struct dom_sid *sid) return false; } - if (sid_check_is_in_our_domain(sid)) { + if (sid_check_is_in_our_sam(sid)) { /* * Passdb lookup via lookuprids */ diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c index 10074d142e..9f45126d5c 100644 --- a/source3/winbindd/winbindd_samr.c +++ b/source3/winbindd/winbindd_samr.c @@ -313,7 +313,7 @@ static NTSTATUS sam_query_user(struct winbindd_domain *domain, ZERO_STRUCT(dom_pol); /* Paranoia check */ - if (!sid_check_is_in_our_domain(user_sid)) { + if (!sid_check_is_in_our_sam(user_sid)) { return NT_STATUS_NO_SUCH_USER; } @@ -684,7 +684,7 @@ static NTSTATUS sam_sid_to_name(struct winbindd_domain *domain, /* Paranoia check */ if (!sid_check_is_in_builtin(sid) && - !sid_check_is_in_our_domain(sid) && + !sid_check_is_in_our_sam(sid) && !sid_check_is_in_unix_users(sid) && !sid_check_is_unix_users(sid) && !sid_check_is_in_unix_groups(sid) && diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index af17e5f7b3..ffc9115ad3 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -85,7 +85,7 @@ static bool is_in_internal_domain(const struct dom_sid *sid) if (sid == NULL) return False; - return (sid_check_is_in_our_domain(sid) || sid_check_is_in_builtin(sid)); + return (sid_check_is_in_our_sam(sid) || sid_check_is_in_builtin(sid)); } -- cgit