From 15fa733e735772b5f14b7a9000b66cd963dde79d Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 16 Mar 2016 09:39:16 +0100
Subject: [PATCH] Fix computing delays

---
 root/sbin/e-smith/expire-accounts                                     | 4 ++--
 .../share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/root/sbin/e-smith/expire-accounts b/root/sbin/e-smith/expire-accounts
index d9cce49..a1af3e4 100644
--- a/root/sbin/e-smith/expire-accounts
+++ b/root/sbin/e-smith/expire-accounts
@@ -99,7 +99,7 @@ foreach my $user ($a->users){
     push @lock, $user->key;
   }
   else{
-    my $remaining = ($exp - $now)->in_units('days');
+    my $remaining = $exp->delta_days($now)->in_units('days');
     print $user->key . ": Account will expire on $lock_date ($remaining days)\n" if $debug;
     $rem->{$user->key} = $remaining if $remaining < $warn_delay;
   }
@@ -156,7 +156,7 @@ foreach my $user (keys %$rem){
       month => $2,
       day   => $3,
     );
-    if ( ($last_notif - $now)->in_units('days') < $days_between_warn ){
+    if ( $last_notif->delta_days($now)->in_units('days') < $days_between_warn ){
       next;
     }
   }
diff --git a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm
index 8b464ef..6e0f306 100644
--- a/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm
+++ b/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/expireaccounts.pm
@@ -103,7 +103,7 @@ sub print_user_table {
                   day   => $3
                 );
               };
-              $days_left = ($lock_on - $now)->in_units('days') if ($lock_on);
+              $days_left = $lock_on->delta_days($now)->in_units('days') if ($lock_on);
             }
             my $addr = ($delivery eq 'local') ? '' : $fwd;
              print $q->Tr(
@@ -146,7 +146,7 @@ sub print_user_table {
               };
               if ($locked_date){
                 my $delete_on = $locked_date->add(days => $delete_in);
-                $days_left = ($delete_on - $now)->in_units('days');
+                $days_left = $delete_on->delta_days($now)->in_units('days');
               }
             }
             my $addr = ($delivery eq 'local') ? '' : $fwd;