summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-11-27 01:51:10 +0000
committerAndrew Tridgell <tridge@samba.org>2001-11-27 01:51:10 +0000
commit1fb4d2f1b0d65e9f48081ae7a225950d4341d923 (patch)
tree5a910a275aafb950cb0098dadcf646fa7500e6b4 /source3
parent3dc6fe1fe471c6924fcf48be98ad2e9bfbb33357 (diff)
downloadsamba-1fb4d2f1b0d65e9f48081ae7a225950d4341d923.tar.gz
samba-1fb4d2f1b0d65e9f48081ae7a225950d4341d923.tar.bz2
samba-1fb4d2f1b0d65e9f48081ae7a225950d4341d923.zip
don't try to auto-change the trust password unless we are in domain
security (This used to be commit 00e4f0c803c6376387c31efd01cf3437c589da9d)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/process.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index d4881b0ba5..bbccc67f97 100644
--- 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;