From 76cc7dedb3a5434232a29d3d6e33bf84184e2d76 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 6 Nov 2006 20:10:30 +0000 Subject: r19581: Merge from SAMBA_3_0_23 --- source/passdb/lookup_sid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/passdb') 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", -- cgit