Reset 'expiry' on keyringer_check_expiration (closes #62)

diff --git a/ChangeLog b/ChangeLog
index 3ded1f5a9c1c82328ddd97ae0e700dd785171c69..04cac732f4d2dbea1e9bdd72aa5f58eeceed3912 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-06 - Silvio Rhatto <rhatto@riseup.net>
+
+       Reset 'expiry' on keyringer_check_expiration, reported and fixed
+       by Jamie (closes #62)
+
 2014-05-20 - 0.3.6 - Silvio Rhatto <rhatto@riseup.net>
 
        Makefile fix

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index fdd84395f61561395648689362d445dbf5945c8d..0360bb4ba2a1b64f8952f6494b68e65b91606a97 100755 (executable)
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -715,6 +715,7 @@ function keyringer_check_expiration {
   fi
 
   # Check the subkeys
+  expiry=""
   for expiry in `gpg --with-colons --fixed-list-mode --list-keys "$recipient" | grep ^sub | cut -d : -f 7`; do
     if [[ "$seconds" -lt "$expiry" ]]; then
       not_expired="1"