summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2007-05-06 21:17:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:50 -0500
commit2a9c7462c7e45ccfc57d5c6943c344980b71d631 (patch)
tree6e49c5bd19fee92b853379a2afac38e6d5365ddd
parent8bbf274f07ed21ae0a9595994c53f6189d40460b (diff)
downloadsamba-2a9c7462c7e45ccfc57d5c6943c344980b71d631.tar.gz
samba-2a9c7462c7e45ccfc57d5c6943c344980b71d631.tar.bz2
samba-2a9c7462c7e45ccfc57d5c6943c344980b71d631.zip
r22717: Add Everyone and AuthenticatedUsers to the user's token
for use by the require-membership-of pam_winbind option. (This used to be commit 11f81c5997a014cca9d98c474e7870ebb07c4642)
-rw-r--r--source3/nsswitch/winbindd_pam.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index d9c9fe91cb..66ac61e5c9 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -128,7 +128,11 @@ static NTSTATUS check_info3_in_group(TALLOC_CTX *mem_ctx,
DOM_SID *require_membership_of_sid;
size_t num_require_membership_of_sid;
DOM_SID *all_sids;
- size_t num_all_sids = (2 + info3->num_groups2 + info3->num_other_sids);
+ /* UserSID, GroupSID, Grooup2SIDs, OtherSIDs, WellKnownSIDs */
+ size_t num_all_sids = (2 +
+ info3->num_groups2 +
+ info3->num_other_sids +
+ 2 );
size_t i, j = 0, k;
size_t group_sid_length;
const char *search_location;
@@ -213,6 +217,11 @@ static NTSTATUS check_info3_in_group(TALLOC_CTX *mem_ctx,
}
j++;
+ /* Well-Known SIDs */
+
+ sid_copy( &all_sids[j++], &global_sid_World );
+ sid_copy( &all_sids[j++], &global_sid_Authenticated_Users );
+
for (i = 0; i < info3->num_groups2; i++) {
sid_copy(&all_sids[j], &(info3->dom_sid.sid));