diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-22 21:15:59 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-22 21:15:59 +0100 |
| commit | 99e637175c0dee050b9c39c124ab1fab8ad7976d (patch) | |
| tree | 60f9f6557297031d293e490a12abcde33c4350fa /source3 | |
| parent | c023828962d7050668c38129170121cc50cd300f (diff) | |
| parent | f1389a39508735bd3133bac9da5eee3c73342d1f (diff) | |
| download | samba-99e637175c0dee050b9c39c124ab1fab8ad7976d.tar.gz samba-99e637175c0dee050b9c39c124ab1fab8ad7976d.tar.bz2 samba-99e637175c0dee050b9c39c124ab1fab8ad7976d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 13 |
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; |