heck for account and password expiration

diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 5c0fe0fc327178fd6c767b78812140e56fbe33da..abec68c9d9d0318164a7d5c175f359f25f3c6685 100644 (file)
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -272,9 +272,17 @@ static int unix_getpw(UNUSED void *instance, REQUEST *request,
        /*
         *      Check if password has expired.
         */
+       if (spwd && spwd->sp_lstchg > 0 && spwd->sp_max >= 0 &&
+           (request->timestamp / 86400) > (spwd->sp_lstchg + spwd->sp_max)) {
+               radlog_request(L_AUTH, 0, request, "[%s]: password has expired", name);
+               return RLM_MODULE_REJECT;
+       }
+       /*
+        *      Check if account has expired.
+        */
        if (spwd && spwd->sp_expire > 0 &&
            (request->timestamp / 86400) > spwd->sp_expire) {
-               radlog_request(L_AUTH, 0, request, "[%s]: password has expired", name);
+               radlog_request(L_AUTH, 0, request, "[%s]: account has expired", name);
                return RLM_MODULE_REJECT;
        }
 #endif