From a284c8843528972904d142b573f1170a08c97751 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 26 May 2008 12:05:21 +0200 Subject: [PATCH] Add function is_dc_trusted_domain_situation(). This is like is_trusted_domain_situation() except that it does not check for lp_allow_trusted_domains(). Michael --- source/include/proto.h | 1 + source/passdb/passdb.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/source/include/proto.h b/source/include/proto.h index 3d72022b9a8..0c770d866c2 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -6271,6 +6271,7 @@ bool pdb_copy_sam_account(struct samu *dst, struct samu *src ); bool pdb_update_bad_password_count(struct samu *sampass, bool *updated); bool pdb_update_autolock_flag(struct samu *sampass, bool *updated); bool pdb_increment_bad_password_count(struct samu *sampass); +bool is_dc_trusted_domain_situation(const char *domain_name); bool is_trusted_domain_situation(const char *domain_name); bool get_trust_pw_clear(const char *domain, char **ret_pwd, const char **account_name, uint32 *channel); diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c index e3a3d3ca9e5..2df2a9c3ce9 100644 --- a/source/passdb/passdb.c +++ b/source/passdb/passdb.c @@ -1517,11 +1517,15 @@ bool pdb_increment_bad_password_count(struct samu *sampass) return True; } +bool is_dc_trusted_domain_situation(const char *domain_name) +{ + return IS_DC && !strequal(domain_name, lp_workgroup()); +} + bool is_trusted_domain_situation(const char *domain_name) { - return IS_DC && - lp_allow_trusted_domains() && - !strequal(domain_name, lp_workgroup()); + return is_dc_trusted_domain_situation(domain_name) && + lp_allow_trusted_domains(); } /******************************************************************* -- 2.47.3