diff options
| author | Michael Adam <obnox@samba.org> | 2007-12-11 14:07:32 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2007-12-13 10:15:19 +0100 |
| commit | 31f221ed9316c8dc2f4911d7b8ddcdf8b74367db (patch) | |
| tree | 4dcfacf42ae581356de18ad4b957ed379e6ac608 | |
| parent | 1084151442552e63c0b9b310273d8d42711aa55c (diff) | |
| download | samba-31f221ed9316c8dc2f4911d7b8ddcdf8b74367db.tar.gz samba-31f221ed9316c8dc2f4911d7b8ddcdf8b74367db.tar.bz2 samba-31f221ed9316c8dc2f4911d7b8ddcdf8b74367db.zip | |
Rename get_trust_pw() to get_trust_pw_hash().
Michael
(This used to be commit 0cde7ac9cb39a0026a38ccf66dbecefc12931074)
| -rw-r--r-- | source3/auth/auth_domain.c | 4 | ||||
| -rw-r--r-- | source3/passdb/passdb.c | 4 | ||||
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 6 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cm.c | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index b428723a06..b2c87174fd 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -129,8 +129,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/source3/passdb/passdb.c b/source3/passdb/passdb.c index 488458fc85..11c5b68197 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -1587,8 +1587,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/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index bf019c89a1..9f1d9c6e3e 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -2444,7 +2444,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", @@ -2557,7 +2558,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", diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index adb9d11edc..d8040d79ac 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -2235,8 +2235,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; |