The branch, master has been updated
via 5aadfe29f07687fe47bcb23b36313e4fc6ada6ee (commit)
from f0dbc9865fd0533828a4b500e51e3aee2c494877 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5aadfe29f07687fe47bcb23b36313e4fc6ada6ee
Author: Gerald (Jerry) Carter <je...@samba.org>
Date: Mon Dec 22 11:07:29 2008 -0800
Fix "allow trusted domain" so it disables trusted domains.
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_util.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index fdfc8ed..748099a 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;
--
Samba Shared Repository
