summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-05-26 12:31:44 +0200
committerMichael Adam <obnox@samba.org>2008-05-26 16:42:24 +0200
commit6efce4738ff28c4f24c8b80be05893bb1643a788 (patch)
tree7fc3fdadda9ca81752aeac7411d9bc419a0c5366
parent48026d814b665e2a766cbe8b82d9c6b22590a16d (diff)
downloadsamba-6efce4738ff28c4f24c8b80be05893bb1643a788.tar.gz
samba-6efce4738ff28c4f24c8b80be05893bb1643a788.tar.bz2
samba-6efce4738ff28c4f24c8b80be05893bb1643a788.zip
passdb: check for is_dc_trusted_domain_situation() in get_trust_pw_hash().
Before fetching legacy password hash, check for trusted domain situation, but also fail if trusted domain support is not enabled. Michael (This used to be commit aa1b8287f44f47f23bd4158112d0a132df04426c)
-rw-r--r--source3/passdb/passdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c
index d69da8f32e..4e9f494c86 100644
--- a/source3/passdb/passdb.c
+++ b/source3/passdb/passdb.c
@@ -1616,7 +1616,7 @@ bool get_trust_pw_hash(const char *domain, uint8 ret_pwd[16],
E_md4hash(pwd, ret_pwd);
SAFE_FREE(pwd);
return true;
- } else if (is_trusted_domain_situation(domain)) {
+ } else if (is_dc_trusted_domain_situation(domain)) {
return false;
}