trust password

(This used to be commit fa86770d56fd4a3e280ee4f5685e29dee2a713fb)

diff --git a/source3/passdb/smbpassfile.c b/source3/passdb/smbpassfile.c
index 13a1a9f50892ec00a3dea88cba92cb567aea9bd1..2456abe50acffc7f2c5997bf681b37a3916a5892 100644 (file)
--- a/source3/passdb/smbpassfile.c
+++ b/source3/passdb/smbpassfile.c
@@ -321,14 +321,14 @@ account is now invalid. Please recreate. Error was %s.\n", strerror(errno) ));
   return True;
 }
 
-BOOL trust_get_passwd( unsigned char trust_passwd[16], char *myname, char *domain)
+BOOL trust_get_passwd( unsigned char trust_passwd[16], char *domain, char *myname)
 {
   time_t lct;
 
   /*
    * Get the machine account password.
    */
-  if(!trust_password_lock( myname, domain, False)) {
+  if(!trust_password_lock( domain, myname, False)) {
     DEBUG(0,("domain_client_validate: unable to open the machine account password file for \
 machine %s in domain %s.\n", myname, domain ));
     return False;

diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c
index 88510c95e7c52f39c8b4232bcea4049067846719..1be24fe130a25fb8dac40b21f9ad8a0cd7dc9941 100644 (file)
--- a/source3/rpcclient/cmd_netlogon.c
+++ b/source3/rpcclient/cmd_netlogon.c
@@ -78,7 +78,7 @@ void cmd_netlogon_login_test(struct client_info *info)
 
        DEBUG(5,("do_nt_login_test: username %s\n", nt_user_name));
 
-       res = res ? trust_get_passwd(trust_passwd, info->myhostname, smb_cli->domain) : False;
+       res = res ? trust_get_passwd(trust_passwd, smb_cli->domain, info->myhostname) : False;
 
 #if 0
        /* check whether the user wants to change their machine password */

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 9c00d6fc008b8ba3c72cf4e1c031443f6f4fb1e9..a38e6da6832bf4380c2c066efb0ffd2508e45413 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -873,7 +873,7 @@ void smbd_process(void)
              return;
       }
 
-      if(global_machine_pasword_needs_changing)
+      if(global_machine_password_needs_changing)
       {
         unsigned char trust_passwd_hash[16];
         time_t lct;
@@ -908,7 +908,7 @@ machine %s in domain %s.\n", global_myname, global_myworkgroup ));
 
         if(t < lct + lp_machine_password_timeout()) {
           trust_password_unlock();
-          global_machine_pasword_needs_changing = False;
+          global_machine_password_needs_changing = False;
           continue;
         }
 
@@ -916,7 +916,7 @@ machine %s in domain %s.\n", global_myname, global_myworkgroup ));
 
         change_trust_account_password( global_myworkgroup, remote_machine_list);
         trust_password_unlock();
-        global_machine_pasword_needs_changing = False;
+        global_machine_password_needs_changing = False;
       }
 
       /*