summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xlib/keyringer/functions1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3ded1f5..04cac73 100644
--- 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 fdd8439..0360bb4 100755
--- 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"