don't try to auto-change the trust password unless we are in domain

security
(This used to be commit 00e4f0c803c6376387c31efd01cf3437c589da9d)

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index d4881b0ba5615ecc4ac4ca73662575367b24b81e..bbccc67f97a06d34ade6e7919fba5abf2f1ba25b 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -1139,7 +1139,10 @@ static BOOL timeout_processing(int deadtime, int *select_timeout, time_t *last_t
     return False;
   }
 
-  if(global_machine_password_needs_changing)
+  if(global_machine_password_needs_changing && 
+     /* for ADS we need to do a regular ADS password change, not a domain
+        password change */
+     lp_security() == SEC_DOMAIN)
   {
     unsigned char trust_passwd_hash[16];
     time_t lct;