summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-06-16 18:40:04 +0200
committerStefan Metzmacher <metze@samba.org>2011-06-16 18:41:01 +0200
commit283f8a7fb5089a7126f07e26315fd06ab59997d8 (patch)
treead6f3cfd0f6c12f52947a9a4f35032181f15cd42
parent67512152c007bb186e4fd8dac5d1aab89bce0689 (diff)
downloadsamba-283f8a7fb5089a7126f07e26315fd06ab59997d8.tar.gz
samba-283f8a7fb5089a7126f07e26315fd06ab59997d8.tar.bz2
samba-283f8a7fb5089a7126f07e26315fd06ab59997d8.zip
Revert "s3-winbind: Fix paranoia checks in winbindd_samr.c."
This reverts commit 207a84d725b905c2b119d2ef0f4f4d4eb391140d. This is the wrong fix for the problem, see bug #8215. metze
-rw-r--r--source3/winbindd/winbindd_samr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index 48ce92d5e7..3b9377f729 100644
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -762,8 +762,8 @@ static NTSTATUS sam_rids_to_names(struct winbindd_domain *domain,
ZERO_STRUCT(lsa_policy);
/* Paranoia check */
- if (!sid_check_is_in_builtin(domain_sid) &&
- !sid_check_is_in_our_domain(domain_sid) &&
+ if (!sid_check_is_builtin(domain_sid) &&
+ !sid_check_is_domain(domain_sid) &&
!sid_check_is_unix_users(domain_sid) &&
!sid_check_is_unix_groups(domain_sid) &&
!sid_check_is_in_wellknown_domain(domain_sid)) {