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)

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0c770d866c2e9dfdd8d90da5f38f1e82cda31dce..f85b667c84adb4014a3092ee6f4a6b087927fec1 100644 (file)
--- 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 4e9f494c86b705bf75ba60bb25275d116162c0ad..a670b46d691897fa9c55a09b62878df3978f6190 100644 (file)
--- 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.