diff options
| author | Michael Adam <obnox@samba.org> | 2008-05-26 12:42:56 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-05-26 16:42:25 +0200 |
| commit | 6cebad5b67d3d815b5f5b3ea1b7711fc15d45cf1 (patch) | |
| tree | fd3af50b748a5facf61631203a8c17ff8c40d0b3 | |
| parent | c5a030a38a520e2cd89dc061f4d2bfee57ce9d84 (diff) | |
| download | samba-6cebad5b67d3d815b5f5b3ea1b7711fc15d45cf1.tar.gz samba-6cebad5b67d3d815b5f5b3ea1b7711fc15d45cf1.tar.bz2 samba-6cebad5b67d3d815b5f5b3ea1b7711fc15d45cf1.zip | |
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)
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/passdb/passdb.c | 6 |
2 files changed, 0 insertions, 7 deletions
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. |