From: rhatto <rhatto@ratatosk.fluxo.info>
Date: Fri, 14 Mar 2014 16:48:18 +0000 (-0300)
Subject: Subkey expiration date check shall not happen with expired keys
X-Git-Tag: 0.3.2~2
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=68e1e1b26bf220e0a5dde780cd6437d9965df89c;p=keyringer.git

Subkey expiration date check shall not happen with expired keys
---

diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index e0cccec..832385e 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -711,10 +711,10 @@ function keyringer_check_expiration {
   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"
-    fi
 
-    if [[ "$ahead" -gt "$expiry" ]] && [ "$BASENAME" == "check" ]; then
-      echo "Warning: subkey from $recipient will expire soon, on `date --date="@$expiry"`"
+      if [[ "$ahead" -gt "$expiry" ]] && [ "$BASENAME" == "check" ]; then
+        echo "Warning: subkey from $recipient will expire soon, on `date --date="@$expiry"`"
+      fi
     fi
   done