git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
969c7bd
)
s3: Fix paranoia check in sam_rids_to_names
author
Volker Lendecke
<vl@samba.org>
Thu, 10 Mar 2011 15:07:36 +0000
(16:07 +0100)
committer
Volker Lendecke
<vl@samba.org>
Thu, 10 Mar 2011 17:48:34 +0000
(18:48 +0100)
source3/winbindd/winbindd_samr.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/winbindd_samr.c
b/source3/winbindd/winbindd_samr.c
index 783d9f9f31329f94b8b9ce53d7f0f69d842145e1..3a4724632fb81b64d8f5232169f39f85fb58b154 100644
(file)
--- 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 "