[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4726-g2d6946b
Jeremy Allison
jra at samba.org
Mon Dec 22 19:07:23 GMT 2008
The branch, v3-3-test has been updated
via 2d6946bf3a3b7465c92e707ef136e34996ae90be (commit)
from 9a94c466210097c852d7e049a57e5777dea6ad84 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 2d6946bf3a3b7465c92e707ef136e34996ae90be
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date: Mon Dec 22 11:06:29 2008 -0800
Fix "allow trusted domain" so it disables trusted domains.
-----------------------------------------------------------------------
Summary of changes:
source/winbindd/winbindd_util.c | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/winbindd/winbindd_util.c b/source/winbindd/winbindd_util.c
index fdfc8ed..748099a 100644
--- a/source/winbindd/winbindd_util.c
+++ b/source/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
More information about the samba-cvs
mailing list