diff options
| author | Jeremy Allison <jra@samba.org> | 2004-08-17 20:11:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:22 -0500 |
| commit | 5cd11b7127afed6a1e4e540721fa15d45aec471b (patch) | |
| tree | c99fc1cef11350865035b9ec5dc09e02dbdfc1a1 | |
| parent | c9e0625f57b4ad82297aad8ce2fa63120c2de2f0 (diff) | |
| download | samba-5cd11b7127afed6a1e4e540721fa15d45aec471b.tar.gz samba-5cd11b7127afed6a1e4e540721fa15d45aec471b.tar.bz2 samba-5cd11b7127afed6a1e4e540721fa15d45aec471b.zip | |
r1871: Patch from Luke Howard <lukeh@PADL.COM> to correctly use
uid_to_sid() and gid_to_sid() in pdb_set_sam_sids().
Jeremy.
(This used to be commit dae084d7134ae3f532861210907cd252d0001c9b)
| -rw-r--r-- | source3/passdb/passdb.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 743978919b..14c8c67aa3 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -190,7 +190,9 @@ static NTSTATUS pdb_set_sam_sids(SAM_ACCOUNT *account_data, const struct passwd const char *guest_account = lp_guestaccount(); GROUP_MAP map; BOOL ret; - + DOM_SID user_sid; + DOM_SID group_sid; + if (!account_data || !pwd) { return NT_STATUS_INVALID_PARAMETER; } @@ -198,7 +200,7 @@ static NTSTATUS pdb_set_sam_sids(SAM_ACCOUNT *account_data, const struct passwd /* this is a hack this thing should not be set this way --SSS */ if (!(guest_account && *guest_account)) { - DEBUG(1, ("NULL guest account!?!?\n")); + DEBUG(1, ("pdb_set_sam_sids: NULL guest account!?!?\n")); return NT_STATUS_UNSUCCESSFUL; } else { /* Ensure this *must* be set right */ @@ -213,8 +215,13 @@ static NTSTATUS pdb_set_sam_sids(SAM_ACCOUNT *account_data, const struct passwd } } - if (!pdb_set_user_sid_from_rid(account_data, algorithmic_pdb_uid_to_user_rid(pwd->pw_uid), PDB_SET)) { - DEBUG(0,("Can't set User SID from RID!\n")); + if (NT_STATUS_IS_OK(uid_to_sid(&user_sid, pwd->pw_uid))) { + if (!pdb_set_user_sid(account_data, &user_sid, PDB_SET)) { + DEBUG(0,("pdb_set_sam_sids: Can't set User SID from mapped UID\n")); + return NT_STATUS_INVALID_PARAMETER; + } + } else if (!pdb_set_user_sid_from_rid(account_data, algorithmic_pdb_uid_to_user_rid(pwd->pw_uid), PDB_SET)) { + DEBUG(0,("pdb_set_sam_sids: Can't set User SID from RID!\n")); return NT_STATUS_INVALID_PARAMETER; } @@ -225,13 +232,18 @@ static NTSTATUS pdb_set_sam_sids(SAM_ACCOUNT *account_data, const struct passwd if( ret ) { if (!pdb_set_group_sid(account_data, &map.sid, PDB_SET)){ - DEBUG(0,("Can't set Group SID!\n")); + DEBUG(0,("pdb_set_sam_sids: Can't set Group SID!\n")); return NT_STATUS_INVALID_PARAMETER; } } else { - if (!pdb_set_group_sid_from_rid(account_data, pdb_gid_to_group_rid(pwd->pw_gid), PDB_SET)) { - DEBUG(0,("Can't set Group SID\n")); + if (NT_STATUS_IS_OK(gid_to_sid(&group_sid, pwd->pw_gid))) { + if (!pdb_set_group_sid(account_data, &group_sid, PDB_SET)) { + DEBUG(0,("pdb_set_sam_sids: Can't set Group SID from mapped GID\n")); + return NT_STATUS_INVALID_PARAMETER; + } + } else if (!pdb_set_group_sid_from_rid(account_data, pdb_gid_to_group_rid(pwd->pw_gid), PDB_SET)) { + DEBUG(0,("pdb_set_sam_sids: Can't set Group SID\n")); return NT_STATUS_INVALID_PARAMETER; } } |