git.samba.org
/
kai
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0dbc98
)
Fix "allow trusted domain" so it disables trusted domains.
author
Gerald (Jerry) Carter
<jerry@samba.org>
Mon, 22 Dec 2008 19:07:29 +0000
(11:07 -0800)
committer
Jeremy Allison
<jra@samba.org>
Mon, 22 Dec 2008 19:07:29 +0000
(11:07 -0800)
source3/winbindd/winbindd_util.c
patch
|
blob
|
history
diff --git
a/source3/winbindd/winbindd_util.c
b/source3/winbindd/winbindd_util.c
index fdfc8ed9d13dd3d076efa461d270da73d150b8ff..748099a32e578d2b7e94605955d750dee9154b2d 100644
(file)
--- 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;