user check: fix expiration/enable order

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm
index 13065764ec20a8edcc4678f5feede3ecd7daebf8..eea6e141aa71a8c883f2819564a988a008da6505 100644 (file)
--- a/src/PVE/AccessControl.pm
+++ b/src/PVE/AccessControl.pm
@@ -653,15 +653,15 @@ sub check_user_enabled {
     my $data = check_user_exist($usercfg, $username, $noerr);
     return undef if !$data;
 
-    return 1 if $data->{enable};
-
-    die "user '$username' is disabled\n" if !$noerr;
-
     my $ctime = time();
     my $expire = $usercfg->{users}->{$username}->{expire};
 
     die "account expired\n" if $expire && ($expire < $ctime);
 
+    return 1 if $data->{enable};
+
+    die "user '$username' is disabled\n" if !$noerr;
+
     return undef;
 }