From 4049c0e69ead3d4ce9df36fdb432424b66abe7c4 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 19 Nov 2011 21:56:10 +0000 Subject: [PATCH] * src/chage.c: Cast 3rd date_to_str parameter to a time_t --- ChangeLog | 1 + src/chage.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f857c495..8fac7122 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,7 @@ shadow_audit_result, use SHADOW_AUDIT_FAILURE instead of 0. * lib/selinux.c: vasprintf requires _GNU_SOURCE to be defined before including stdio.h. + * src/chage.c: Cast 3rd date_to_str parameter to a time_t 2011-11-19 Nicolas François diff --git a/src/chage.c b/src/chage.c index b840e778..2df65a94 100644 --- a/src/chage.c +++ b/src/chage.c @@ -208,7 +208,7 @@ static int new_fields (void) if (-1 == lstchgdate) { strcpy (buf, "-1"); } else { - date_to_str (buf, sizeof buf, lstchgdate * SCALE); + date_to_str (buf, sizeof buf, (time_t) lstchgdate * SCALE); } change_field (buf, sizeof buf, _("Last Password Change (YYYY-MM-DD)")); @@ -239,7 +239,7 @@ static int new_fields (void) if (-1 == expdate) { strcpy (buf, "-1"); } else { - date_to_str (buf, sizeof buf, expdate * SCALE); + date_to_str (buf, sizeof buf, (time_t) expdate * SCALE); } change_field (buf, sizeof buf, @@ -679,8 +679,8 @@ static void update_age (/*@null@*/const struct spwd *sp, struct passwd pwent = *pw; memzero (&spwent, sizeof spwent); - spwent.sp_namp = xstrdup (pw->pw_name); - spwent.sp_pwdp = xstrdup (pw->pw_passwd); + spwent.sp_namp = xstrdup (pwent.pw_name); + spwent.sp_pwdp = xstrdup (pwent.pw_passwd); spwent.sp_flag = SHADOW_SP_FLAG_UNSET; pwent.pw_passwd = SHADOW_PASSWD_STRING; /* XXX warning: const */