From 6cebad5b67d3d815b5f5b3ea1b7711fc15d45cf1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 26 May 2008 12:42:56 +0200 Subject: Remove unused function is_trusted_domain_situation(). This combined check has been replaced by is_dc_trusted_domain_situation() which does not check for lp_allow_trusted_domains(). Michael (This used to be commit 0a24c038b7bc6edef0021eb121a072cc7e8f9165) --- source3/include/proto.h | 1 - source3/passdb/passdb.c | 6 ------ 2 files changed, 7 deletions(-) (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index 0c770d866c..f85b667c84 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -6272,7 +6272,6 @@ 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); bool get_trust_pw_hash(const char *domain, uint8 ret_pwd[16], diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 4e9f494c86..a670b46d69 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -1522,12 +1522,6 @@ 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_trusted_domain_situation(domain_name) && - lp_allow_trusted_domains(); -} - /******************************************************************* Wrapper around retrieving the clear text trust account password. appropriate account name is stored in account_name. -- cgit