summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-03-10 16:07:36 +0100
committerVolker Lendecke <vl@samba.org>2011-03-10 18:48:34 +0100
commit8d0e2415309ee15fbf509d44caf3e1df5b900620 (patch)
tree8ff3e211b7df7fb666c9954277dfc052ccbb8c04
parent969c7bd77bdda55b9a07fc6381c4c1f562861cbe (diff)
downloadsamba-8d0e2415309ee15fbf509d44caf3e1df5b900620.tar.gz
samba-8d0e2415309ee15fbf509d44caf3e1df5b900620.tar.bz2
samba-8d0e2415309ee15fbf509d44caf3e1df5b900620.zip
s3: Fix paranoia check in sam_rids_to_names
-rw-r--r--source3/winbindd/winbindd_samr.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 783d9f9f31..3a4724632f 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -772,11 +772,9 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
ZERO_STRUCT(lsa_policy);
/* Paranoia check */
- if (!sid_check_is_in_builtin(sid) &&
- !sid_check_is_in_our_domain(sid) &&
- !sid_check_is_in_unix_users(sid) &&
+ if (!sid_check_is_builtin(sid) &&
+ !sid_check_is_domain(sid) &&
!sid_check_is_unix_users(sid) &&
- !sid_check_is_in_unix_groups(sid) &&
!sid_check_is_unix_groups(sid) &&
!sid_check_is_in_wellknown_domain(sid)) {
DEBUG(0, ("sam_rids_to_names: possible deadlock - trying to "