moved secrets fns into secrets.c

diff --git a/source/rpc_client/cli_netlogon.c b/source/rpc_client/cli_netlogon.c
index 0043a1894edea18b9c9e581a3301f31bed0916c9..065bd576497e59b00b38d97c36c0a88ef6f6c37c 100644 (file)
--- a/source/rpc_client/cli_netlogon.c
+++ b/source/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/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index 639453b4d758b1b1d153e1c21278236031c32a48..d00bb41b88d3f70729e3c505aee6621abd8669cb 100644 (file)
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/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/source/smbd/password.c b/source/smbd/password.c
index 614e5a84fc655ef5c955d35660a902f31268c826..d3a728bf4236b7f6895379142b57454a5af71384 100644 (file)
--- a/source/smbd/password.c
+++ b/source/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/source/smbd/process.c b/source/smbd/process.c
index 077a97ed640c34351a1a0828c8ffaeb254e34dbb..82e61a138e8e17b6a906f573a597e80da10d038c 100644 (file)
--- a/source/smbd/process.c
+++ b/source/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;