|
 |
9f13c6 |
Index: shadow-4.5/src/faillog.c
|
|
|
9f13c6 |
===================================================================
|
|
|
9f13c6 |
--- shadow-4.5.orig/src/faillog.c
|
|
|
9f13c6 |
+++ shadow-4.5/src/faillog.c
|
|
|
9f13c6 |
@@ -163,10 +163,14 @@ static void print_one (/*@null@*/const s
|
|
|
9f13c6 |
}
|
|
|
9f13c6 |
|
|
|
9f13c6 |
tm = localtime (&fl.fail_time);
|
|
|
9f13c6 |
+ if (tm == NULL) {
|
|
|
9f13c6 |
+ cp = "(unknown)";
|
|
|
9f13c6 |
+ } else {
|
|
|
9f13c6 |
#ifdef HAVE_STRFTIME
|
|
|
9f13c6 |
- strftime (ptime, sizeof (ptime), "%D %H:%M:%S %z", tm);
|
|
|
9f13c6 |
- cp = ptime;
|
|
|
9f13c6 |
+ strftime (ptime, sizeof (ptime), "%D %H:%M:%S %z", tm);
|
|
|
9f13c6 |
+ cp = ptime;
|
|
|
9f13c6 |
#endif
|
|
|
9f13c6 |
+ }
|
|
|
9f13c6 |
printf ("%-9s %5d %5d ",
|
|
|
9f13c6 |
pw->pw_name, fl.fail_cnt, fl.fail_max);
|
|
|
9f13c6 |
/* FIXME: cp is not defined ifndef HAVE_STRFTIME */
|
|
|
9f13c6 |
Index: shadow-4.5/src/chage.c
|
|
|
9f13c6 |
===================================================================
|
|
|
9f13c6 |
--- shadow-4.5.orig/src/chage.c
|
|
|
9f13c6 |
+++ shadow-4.5/src/chage.c
|
|
|
9f13c6 |
@@ -168,6 +168,10 @@ static void date_to_str (char *buf, size
|
|
|
9f13c6 |
struct tm *tp;
|
|
|
9f13c6 |
|
|
|
9f13c6 |
tp = gmtime (&date);
|
|
|
9f13c6 |
+ if (tp == NULL) {
|
|
|
9f13c6 |
+ (void) snprintf (buf, maxsize, "(unknown)");
|
|
|
9f13c6 |
+ return;
|
|
|
9f13c6 |
+ }
|
|
|
9f13c6 |
#ifdef HAVE_STRFTIME
|
|
|
9f13c6 |
(void) strftime (buf, maxsize, "%Y-%m-%d", tp);
|
|
|
9f13c6 |
#else
|
|
|
9f13c6 |
Index: shadow-4.5/src/lastlog.c
|
|
|
9f13c6 |
===================================================================
|
|
|
9f13c6 |
--- shadow-4.5.orig/src/lastlog.c
|
|
|
9f13c6 |
+++ shadow-4.5/src/lastlog.c
|
|
|
9f13c6 |
@@ -158,13 +158,17 @@ static void print_one (/*@null@*/const s
|
|
|
9f13c6 |
|
|
|
9f13c6 |
ll_time = ll.ll_time;
|
|
|
9f13c6 |
tm = localtime (&ll_time);
|
|
|
9f13c6 |
+ if (tm == NULL) {
|
|
|
9f13c6 |
+ cp = "(unknown)";
|
|
|
9f13c6 |
+ } else {
|
|
|
9f13c6 |
#ifdef HAVE_STRFTIME
|
|
|
9f13c6 |
- strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm);
|
|
|
9f13c6 |
- cp = ptime;
|
|
|
9f13c6 |
+ strftime (ptime, sizeof (ptime), "%a %b %e %H:%M:%S %z %Y", tm);
|
|
|
9f13c6 |
+ cp = ptime;
|
|
|
9f13c6 |
#else
|
|
|
9f13c6 |
- cp = asctime (tm);
|
|
|
9f13c6 |
- cp[24] = '\0';
|
|
|
9f13c6 |
+ cp = asctime (tm);
|
|
|
9f13c6 |
+ cp[24] = '\0';
|
|
|
9f13c6 |
#endif
|
|
|
9f13c6 |
+ }
|
|
|
9f13c6 |
|
|
|
9f13c6 |
if (ll.ll_time == (time_t) 0) {
|
|
|
9f13c6 |
cp = _("**Never logged in**\0");
|
|
|
9f13c6 |
Index: shadow-4.5/src/passwd.c
|
|
|
9f13c6 |
===================================================================
|
|
|
9f13c6 |
--- shadow-4.5.orig/src/passwd.c
|
|
|
9f13c6 |
+++ shadow-4.5/src/passwd.c
|
|
|
9f13c6 |
@@ -455,6 +455,9 @@ static /*@observer@*/const char *date_to
|
|
|
9f13c6 |
struct tm *tm;
|
|
|
9f13c6 |
|
|
|
9f13c6 |
tm = gmtime (&t);
|
|
|
9f13c6 |
+ if (tm == NULL) {
|
|
|
9f13c6 |
+ return "(unknown)";
|
|
|
9f13c6 |
+ }
|
|
|
9f13c6 |
#ifdef HAVE_STRFTIME
|
|
|
9f13c6 |
(void) strftime (buf, sizeof buf, "%m/%d/%Y", tm);
|
|
|
9f13c6 |
#else /* !HAVE_STRFTIME */
|
|
|
9f13c6 |
Index: shadow-4.5/src/usermod.c
|
|
|
9f13c6 |
===================================================================
|
|
|
9f13c6 |
--- shadow-4.5.orig/src/usermod.c
|
|
|
9f13c6 |
+++ shadow-4.5/src/usermod.c
|
|
|
9f13c6 |
@@ -210,6 +210,10 @@ static void date_to_str (/*@unique@*//*@
|
|
|
9f13c6 |
} else {
|
|
|
9f13c6 |
time_t t = (time_t) date;
|
|
|
9f13c6 |
tp = gmtime (&t);
|
|
|
9f13c6 |
+ if (tp == NULL) {
|
|
|
9f13c6 |
+ strncpy (buf, "unknown", maxsize);
|
|
|
9f13c6 |
+ return;
|
|
|
9f13c6 |
+ }
|
|
|
9f13c6 |
#ifdef HAVE_STRFTIME
|
|
|
9f13c6 |
strftime (buf, maxsize, "%Y-%m-%d", tp);
|
|
|
9f13c6 |
#else
|