diff options
author | Tim Potter <tpot@samba.org> | 2002-11-08 01:38:45 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2002-11-08 01:38:45 +0000 |
commit | 66531104fed805080b53838eb720e81393675f98 (patch) | |
tree | 098a3ce17b249e5beba8ed7c002f140e9735770b | |
parent | 72b7cfe4f14abfc553072bf341196ec98b0d40d6 (diff) | |
download | samba-66531104fed805080b53838eb720e81393675f98.tar.gz samba-66531104fed805080b53838eb720e81393675f98.tar.bz2 samba-66531104fed805080b53838eb720e81393675f98.zip |
Don't set global_machine_password_needs_changing if
lp_machine_password_timeout() is set to zero.
(This used to be commit 3692919aee186498848715505047a1cde83758b7)
-rw-r--r-- | source3/auth/auth_domain.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index e18d809efb..f58e8bac47 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -510,10 +510,12 @@ static NTSTATUS check_ntdomain_security(const struct auth_context *auth_context, return NT_STATUS_CANT_ACCESS_DOMAIN_INFO; } - /* Test if machine password is expired and need to be changed */ - if (time(NULL) > last_change_time + lp_machine_password_timeout()) - { - global_machine_password_needs_changing = True; + /* Test if machine password has expired and needs to be changed */ + if (lp_machine_password_timeout()) { + if (time(NULL) > (last_change_time + + lp_machine_password_timeout())) { + global_machine_password_needs_changing = True; + } } /* |