The branch, master has been updated via 9077fc7 Remove an unused function call. from 14cbc79 selftest: re-enable nss_winbind via nss_wrapper in the test-envs.
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 9077fc79d427aff3ca0959cd0214f6d2385d8a51 Author: Richard Sharpe <realrichardsha...@gmail.com> Date: Thu Feb 12 18:22:17 2015 -0800 Remove an unused function call. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Fri Feb 13 23:29:54 CET 2015 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/include/secrets.h | 1 - source3/passdb/machine_account_secrets.c | 17 ----------------- 2 files changed, 18 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/secrets.h b/source3/include/secrets.h index 16162e1..bd0da4b 100644 --- a/source3/include/secrets.h +++ b/source3/include/secrets.h @@ -97,7 +97,6 @@ bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid); bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid); bool secrets_store_domain_guid(const char *domain, struct GUID *guid); bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid); -void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain); enum netr_SchannelType get_default_sec_channel(void); bool secrets_fetch_trust_account_password_legacy(const char *domain, uint8_t ret_pwd[16], diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c index 37ee9bc..717eaa1 100644 --- a/source3/passdb/machine_account_secrets.c +++ b/source3/passdb/machine_account_secrets.c @@ -284,23 +284,6 @@ static const char *trust_keystr(const char *domain) } /************************************************************************ - Lock the trust password entry. -************************************************************************/ - -void *secrets_get_trust_account_lock(TALLOC_CTX *mem_ctx, const char *domain) -{ - struct db_context *db_ctx; - if (!secrets_init()) { - return NULL; - } - - db_ctx = secrets_db_ctx(); - - return dbwrap_fetch_locked( - db_ctx, mem_ctx, string_term_tdb_data(trust_keystr(domain))); -} - -/************************************************************************ Routine to get the default secure channel type for trust accounts ************************************************************************/ -- Samba Shared Repository