diff options
| author | Gerald Carter <jerry@samba.org> | 2006-11-06 20:10:30 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2006-11-06 20:10:30 +0000 |
| commit | 76cc7dedb3a5434232a29d3d6e33bf84184e2d76 (patch) | |
| tree | 6e03d843dc100d65201b1833fff36cafbfcb1cad /source/passdb | |
| parent | 47dde11977c259e804ae67f1507d0e2f7e8263fc (diff) | |
| download | samba-76cc7dedb3a5434232a29d3d6e33bf84184e2d76.tar.gz samba-76cc7dedb3a5434232a29d3d6e33bf84184e2d76.tar.xz samba-76cc7dedb3a5434232a29d3d6e33bf84184e2d76.zip | |
r19581: Merge from SAMBA_3_0_23
Diffstat (limited to 'source/passdb')
| -rw-r--r-- | source/passdb/lookup_sid.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c index 6f0140386a2..7082cd3abd4 100644 --- a/source/passdb/lookup_sid.c +++ b/source/passdb/lookup_sid.c @@ -1076,7 +1076,8 @@ void uid_to_sid(DOM_SID *psid, uid_t uid) if (fetch_sid_from_uid_cache(psid, uid)) return; - if (lp_idmap_uid(&low, &high) && (uid >= low) && (uid <= high) && + if ((lp_winbind_trusted_domains_only() || + (lp_idmap_uid(&low, &high) && (uid >= low) && (uid <= high))) && winbind_uid_to_sid(psid, uid)) { DEBUG(10,("uid_to_sid: winbindd %u -> %s\n", @@ -1121,7 +1122,8 @@ void gid_to_sid(DOM_SID *psid, gid_t gid) if (fetch_sid_from_gid_cache(psid, gid)) return; - if (lp_idmap_gid(&low, &high) && (gid >= low) && (gid <= high) && + if ((lp_winbind_trusted_domains_only() || + (lp_idmap_gid(&low, &high) && (gid >= low) && (gid <= high))) && winbind_gid_to_sid(psid, gid)) { DEBUG(10,("gid_to_sid: winbindd %u -> %s\n", |