summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-06-07 04:45:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:19 -0500
commit5cd234a1fff1e9d025eea6600649e56c997eafc2 (patch)
tree5fff63255c0a2b6a14c0add47bbc599b66005d60
parentbc78cca290559c5ca7623b9f6d9933e32668b9c4 (diff)
downloadsamba-5cd234a1fff1e9d025eea6600649e56c997eafc2.tar.gz
samba-5cd234a1fff1e9d025eea6600649e56c997eafc2.tar.xz
samba-5cd234a1fff1e9d025eea6600649e56c997eafc2.zip
r16076: Fix for machine password timeout overflow from Shlomi Yaakobovich
<Shlomi@exanet.com>. Jeremy.
-rw-r--r--source/auth/auth_domain.c2
-rw-r--r--source/passdb/secrets.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index 6360d10b692..bedd318c3c3 100644
--- a/source/auth/auth_domain.c
+++ b/source/auth/auth_domain.c
@@ -403,7 +403,7 @@ static NTSTATUS check_trustdomain_security(const struct auth_context *auth_conte
#if 0
/* Test if machine password is expired and need to be changed */
- if (time(NULL) > last_change_time + lp_machine_password_timeout())
+ if (time(NULL) > last_change_time + (time_t)lp_machine_password_timeout())
{
global_machine_password_needs_changing = True;
}
diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index db560b632fd..ee7c441fcfc 100644
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -310,7 +310,7 @@ BOOL secrets_fetch_trust_account_password(const char *domain, uint8 ret_pwd[16],
/* Test if machine password has expired and needs to be changed */
if (lp_machine_password_timeout()) {
if (pass->mod_time > 0 && time(NULL) > (pass->mod_time +
- lp_machine_password_timeout())) {
+ (time_t)lp_machine_password_timeout())) {
global_machine_password_needs_changing = True;
}
}