Rename get_trust_pw() to get_trust_pw_hash().

Michael

diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index 455eb1fa3bdf6a6205fd4d216ec4936e5c989d15..3fae8b46c96e55d42ab80e7eae723409c9a3ea16 100644 (file)
--- a/source/auth/auth_domain.c
+++ b/source/auth/auth_domain.c
@@ -130,8 +130,8 @@ machine %s. Error was : %s.\n", dc_name, nt_errstr(result)));
                unsigned char machine_pwd[16];
                const char *account_name;
 
-               if (!get_trust_pw(domain, machine_pwd, &account_name,
-                                 &sec_chan_type))
+               if (!get_trust_pw_hash(domain, machine_pwd, &account_name,
+                                      &sec_chan_type))
                {
                        DEBUG(0, ("connect_to_domain_password_server: could not fetch "
                        "trust account password for domain '%s'\n",

diff --git a/source/nsswitch/winbindd_cm.c b/source/nsswitch/winbindd_cm.c
index ceedac1bd4d5852f21d2979ae77cd6f7ee1a69f4..0e0f3ec96860983054bb172a2d844fdc648459cb 100644 (file)
--- a/source/nsswitch/winbindd_cm.c
+++ b/source/nsswitch/winbindd_cm.c
@@ -1991,8 +1991,8 @@ NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
                neg_flags |= NETLOGON_NEG_SCHANNEL;
        }
 
-       if (!get_trust_pw(domain->name, mach_pwd, &account_name,
-                         &sec_chan_type))
+       if (!get_trust_pw_hash(domain->name, mach_pwd, &account_name,
+                              &sec_chan_type))
        {
                cli_rpc_pipe_close(netlogon_pipe);
                return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;

diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index edb9aea97e020cb315b04b5f2d67304d6f1f0152..570feb3c854734d2e15545c11f9e57e3431ebeed 100644 (file)
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -725,8 +725,8 @@ BOOL get_trust_pw_clear(const char *domain, char **ret_pwd,
  appropriate account name is stored in account_name.
 *******************************************************************/
 
-BOOL get_trust_pw(const char *domain, uint8 ret_pwd[16],
-                 const char **account_name, uint32 *channel)
+BOOL get_trust_pw_hash(const char *domain, uint8 ret_pwd[16],
+                      const char **account_name, uint32 *channel)
 {
        char *pwd = NULL;
        time_t last_set_time;

diff --git a/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 07c08f1a557a275aa258757e63f778dfeb0f5836..f109e7d138531a6d24bc07973e00b655a476c5fe 100644 (file)
--- a/source/rpc_client/cli_pipe.c
+++ b/source/rpc_client/cli_pipe.c
@@ -2443,7 +2443,8 @@ struct rpc_pipe_client *get_schannel_session_key(struct cli_state *cli,
        }
 
        /* Get the machine account credentials from secrets.tdb. */
-       if (!get_trust_pw(domain, machine_pwd, &machine_account, &sec_chan_type))
+       if (!get_trust_pw_hash(domain, machine_pwd, &machine_account,
+                              &sec_chan_type))
        {
                DEBUG(0, ("get_schannel_session_key: could not fetch "
                        "trust account password for domain '%s'\n",
@@ -2556,7 +2557,8 @@ static struct rpc_pipe_client *get_schannel_session_key_auth_ntlmssp(struct cli_
        }
 
        /* Get the machine account credentials from secrets.tdb. */
-       if (!get_trust_pw(domain, machine_pwd, &machine_account, &sec_chan_type))
+       if (!get_trust_pw_hash(domain, machine_pwd, &machine_account,
+                              &sec_chan_type))
        {
                DEBUG(0, ("get_schannel_session_key_auth_ntlmssp: could not fetch "
                        "trust account password for domain '%s'\n",