From ab7648d9c0ce64f06b5f5669c8603817816a5338 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 4 Mar 2016 08:57:39 +0100
Subject: [PATCH] Fix delete date

---
 root/sbin/e-smith/expire-accounts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/root/sbin/e-smith/expire-accounts b/root/sbin/e-smith/expire-accounts
index 9865232..717bed0 100644
--- a/root/sbin/e-smith/expire-accounts
+++ b/root/sbin/e-smith/expire-accounts
@@ -71,9 +71,11 @@ foreach my $user ($a->users){
         month => $2,
         day   => $3,
       );
-      my $delete_date = $locked->add( days => $delete);
-      print $user->key . ": Account must be deleted\n" if $debug;
-      push @delete, $user->key;
+      my $delete_date = $locked->add( days => $delete );
+      if ( $delete_date < $now ){
+        print $user->key . ": Account must be deleted\n" if $debug;
+        push @delete, $user->key;
+      }
     }
     next;
   }