summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/passdb.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index 2df2a9c3ce..874355da67 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -1543,7 +1543,11 @@ bool get_trust_pw_clear(const char *domain, char **ret_pwd,
/* if we are a DC and this is not our domain, then lookup an account
* for the domain trust */
- if (is_trusted_domain_situation(domain)) {
+ if (is_dc_trusted_domain_situation(domain)) {
+ if (!lp_allow_trusted_domains()) {
+ return false;
+ }
+
if (!pdb_get_trusteddom_pw(domain, ret_pwd, NULL,
&last_set_time))
{