From a186e598c43cb3a9a3ff7f4626407074cc938e96 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 26 May 2008 12:11:21 +0200 Subject: passdb: in get_trust_pw_clear() correctly fail if trusted domains not supported (but trusted domain situation was found) This completes the fix for bugs #5425 and #5451 by Steven Dannemann, in that now no special cases are left uncovered. Michael (This used to be commit 0b26bcd3becb869319bca48bbf244c18b6e8e3dd) --- source3/passdb/passdb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3') 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)) { -- cgit