summaryrefslogtreecommitdiff
path: root/source3
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
commitf897e7094f9630a808b9d4622bb542ac676a8fb2 (patch)
tree6c74208e8b4e1ff8523482570481d0182503d655 /source3
parentefdc5b72fd5c154172a94eb2e1ffa22cbbd7aacf (diff)
downloadsamba-f897e7094f9630a808b9d4622bb542ac676a8fb2.tar.gz
samba-f897e7094f9630a808b9d4622bb542ac676a8fb2.tar.bz2
samba-f897e7094f9630a808b9d4622bb542ac676a8fb2.zip
r16076: Fix for machine password timeout overflow from Shlomi Yaakobovich
<Shlomi@exanet.com>. Jeremy. (This used to be commit 5cd234a1fff1e9d025eea6600649e56c997eafc2)
Diffstat (limited to 'source3')
-rw-r--r--source3/auth/auth_domain.c2
-rw-r--r--source3/passdb/secrets.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 6360d10b69..bedd318c3c 100644
--- a/source3/auth/auth_domain.c
+++ b/source3/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/source3/passdb/secrets.c b/source3/passdb/secrets.c
index db560b632f..ee7c441fcf 100644
--- a/source3/passdb/secrets.c
+++ b/source3/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;
}
}