summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2000-06-03 06:22:19 +0000
committerAndrew Tridgell <tridge@samba.org>2000-06-03 06:22:19 +0000
commitda44845a0907bc6c9da9aabc0374b8280a85017f (patch)
treee218397cdcc7f3d01c2575389f6e9d14d546f6a6
parent843120837caf6f32324982dc3c12cf79465cf581 (diff)
downloadsamba-da44845a0907bc6c9da9aabc0374b8280a85017f.tar.gz
samba-da44845a0907bc6c9da9aabc0374b8280a85017f.tar.bz2
samba-da44845a0907bc6c9da9aabc0374b8280a85017f.zip
moved secrets fns into secrets.c
(This used to be commit f890bcf06786e7c63bf76fad2fd46d287a99a270)
-rw-r--r--source3/rpc_client/cli_netlogon.c4
-rw-r--r--source3/rpcclient/cmd_netlogon.c4
-rw-r--r--source3/smbd/password.c2
-rw-r--r--source3/smbd/process.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 0043a1894e..065bd57649 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -636,7 +636,7 @@ BOOL change_trust_account_password( char *domain, char *remote_machine_list)
time_t lct;
BOOL res = False;
- if(!get_trust_account_password(domain, old_trust_passwd_hash, &lct)) {
+ if(!secrets_fetch_trust_account_password(domain, old_trust_passwd_hash, &lct)) {
DEBUG(0,("change_trust_account_password: unable to read the machine \
account password for domain %s.\n", domain));
return False;
@@ -693,7 +693,7 @@ domain %s.\n", timestring(False), domain));
* Return the result of trying to write the new password
* back into the trust account file.
*/
- res = set_trust_account_password(domain, new_trust_passwd_hash);
+ res = secrets_store_trust_account_password(domain, new_trust_passwd_hash);
memset(new_trust_passwd_hash, 0, 16);
memset(old_trust_passwd_hash, 0, 16);
return res;
diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 639453b4d7..d00bb41b88 100644
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -79,8 +79,8 @@ void cmd_netlogon_login_test(struct client_info *info)
DEBUG(5,("do_nt_login_test: username %s\n", nt_user_name));
- res = res ? get_trust_account_password(smb_cli->domain,
- trust_passwd, NULL) : False;
+ res = res ? secrets_fetch_trust_account_password(smb_cli->domain,
+ trust_passwd, NULL) : False;
#if 0
/* check whether the user wants to change their machine password */
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 614e5a84fc..d3a728bf42 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -1437,7 +1437,7 @@ BOOL domain_client_validate( char *user, char *domain,
/*
* Get the machine account password for our primary domain
*/
- if (!get_trust_account_password(lp_workgroup(), trust_passwd, NULL))
+ if (!secrets_fetch_trust_account_password(lp_workgroup(), trust_passwd, NULL))
{
return False;
}
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 077a97ed64..82e61a138e 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -948,7 +948,7 @@ static BOOL timeout_processing(int deadtime, int *select_timeout, time_t *last_t
* First, open the machine password file with an exclusive lock.
*/
- if(!get_trust_account_password(global_myworkgroup, trust_passwd_hash, &lct)) {
+ if(!secrets_fetch_trust_account_password(global_myworkgroup, trust_passwd_hash, &lct)) {
DEBUG(0,("process: unable to read the machine account password for \
machine %s in domain %s.\n", global_myname, global_myworkgroup ));
return True;