* libmisc/isexpired.c: If there are no shadow entry, there is no

	need to convert the password entry to a shadow entry. The password
	is valid.

diff --git a/ChangeLog b/ChangeLog
index 2f52970a6c4fd2aa5a5e5863a83e3a3655f64d81..aa72d20f40f2539d6cb6480eca803b26897900ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-05  Nicolas François  <nicolas.francois@centraliens.net>
+
+       * libmisc/isexpired.c: If there are no shadow entry, there is no
+       need to convert the password entry to a shadow entry. The password
+       is valid.
+
 2009-04-05  Nicolas François  <nicolas.francois@centraliens.net>
 
        * man/usermod.8.xml: Split some paragraphs into smaller units.

diff --git a/libmisc/isexpired.c b/libmisc/isexpired.c
index 728159fb5f84451f39b1ac5ce661b48a8bcde491..aad91c5e349ae0bf40d5c81de3edfe8171be7d04 100644 (file)
--- a/libmisc/isexpired.c
+++ b/libmisc/isexpired.c
@@ -66,7 +66,7 @@ int isexpired (const struct passwd *pw, const struct spwd *sp)
        now = (long) time ((time_t *) 0) / SCALE;
 
        if (NULL == sp) {
-               sp = pwd_to_spwd (pw);
+               return 0;
        }
 
        /*