Module Name:    src
Committed By:   christos
Date:           Fri Apr  2 15:17:53 UTC 2010

Modified Files:
        src/crypto/dist/heimdal/appl/ftp/ftpd: kauth.c

Log Message:
handle ctime returning NULL.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/dist/heimdal/appl/ftp/ftpd/kauth.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/dist/heimdal/appl/ftp/ftpd/kauth.c
diff -u src/crypto/dist/heimdal/appl/ftp/ftpd/kauth.c:1.2 src/crypto/dist/heimdal/appl/ftp/ftpd/kauth.c:1.3
--- src/crypto/dist/heimdal/appl/ftp/ftpd/kauth.c:1.2	Sat Mar 22 04:36:50 2008
+++ src/crypto/dist/heimdal/appl/ftp/ftpd/kauth.c	Fri Apr  2 11:17:52 2010
@@ -34,7 +34,7 @@
 #include "ftpd_locl.h"
 
 __RCSID("$Heimdal: kauth.c 15666 2005-07-19 17:08:11Z lha $"
-        "$NetBSD: kauth.c,v 1.2 2008/03/22 08:36:50 mlelstv Exp $");
+        "$NetBSD: kauth.c,v 1.3 2010/04/02 15:17:52 christos Exp $");
 
 #if defined(KRB4) || defined(KRB5)
 
@@ -238,8 +238,9 @@
     char *cp;
     time_t t = (time_t)dp;
 
-    if (t == (time_t)(-1L)) return "***  Never  *** ";
-    cp = ctime(&t) + 4;
+    if (t == (time_t)(-1L) || (cp = ctime(&t)) == NULL)
+	return "***  Never  *** ";
+    cp += 4;
     cp[15] = '\0';
     return (cp);
 }

Reply via email to