From e7eeb5ceac07f83630ced5e9cf18b10083a9aca8 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Thu, 12 Jun 2014 09:31:03 -0300
Subject: Do not expire already disabled users, it fixes #3644

---
 etc/rc.expireaccounts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/rc.expireaccounts b/etc/rc.expireaccounts
index 5058ac5..53e3874 100755
--- a/etc/rc.expireaccounts
+++ b/etc/rc.expireaccounts
@@ -45,7 +45,7 @@
 			continue;
 		echo "1\n";
 		echo "User {$user['name']} expires {$user['expires']}\n";
-		if(!$user['expires'])
+		if(!$user['expires'] || isset($user['disabled']))
 			continue;
 		echo "1\n";
 		if(strtotime("-1 day") > strtotime($user['expires'])) {
-- 
cgit v1.1