summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald (Jerry) Carter <jerry@samba.org>2008-12-22 11:07:29 -0800
committerJeremy Allison <jra@samba.org>2008-12-22 11:07:29 -0800
commit5aadfe29f07687fe47bcb23b36313e4fc6ada6ee (patch)
treedb970b62caf44335c7536f0ee95994f2893e9274 /source3
parentf0dbc9865fd0533828a4b500e51e3aee2c494877 (diff)
downloadsamba-5aadfe29f07687fe47bcb23b36313e4fc6ada6ee.tar.gz
samba-5aadfe29f07687fe47bcb23b36313e4fc6ada6ee.tar.bz2
samba-5aadfe29f07687fe47bcb23b36313e4fc6ada6ee.zip
Fix "allow trusted domain" so it disables trusted domains.
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd_util.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index fdfc8ed9d1..748099a32e 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -540,7 +540,11 @@ static void rescan_forest_trusts( void )
void rescan_trusted_domains( void )
{
time_t now = time(NULL);
-
+
+ /* Check that we allow trusted domains at all */
+ if (!lp_allow_trusted_domains())
+ return;
+
/* see if the time has come... */
if ((now >= last_trustdom_scan) &&
@@ -796,7 +800,12 @@ void check_domain_trusted( const char *name, const DOM_SID *user_sid )
struct winbindd_domain *domain;
DOM_SID dom_sid;
uint32 rid;
-
+
+ /* Check if we even care */
+
+ if (!lp_allow_trusted_domains())
+ return;
+
domain = find_domain_from_name_noinit( name );
if ( domain )
return;