From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 1 Aug 2008 01:44:18 +0000 (-0400)
Subject: be a little more helpful by printing out the actual expiration dates when things... 
X-Git-Tag: monkeysphere_0.7-1~20
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=60931f1c182c6b163862c2eb34b48e459c51c23a

be a little more helpful by printing out the actual expiration dates when things are expiring.
---

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 03a4ccb..16836b2 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -387,6 +387,9 @@ diagnostics() {
     local curdate
     local warnwindow
     local warndate
+    local create
+    local expire
+    local uid
 
     seckey=$(gpg_host --list-secret-keys --with-colons --fixed-list-mode)
     keysfound=$(echo "$seckey" | grep -c ^sec:)
@@ -408,7 +411,7 @@ diagnostics() {
 		echo "Host key is expired!"
 		# FIXME: recommend a way to resolve this other than re-keying?
 	    elif (( "$keyexp" < "$warndate" )); then
-		echo "Host key expires in less than $warnwindow"
+		echo "Host key expires in less than $warnwindow:" $(date -d "$(( $keyexp - $curdate )) seconds" +%F)		
 		# FIXME: recommend a way to resolve this?
 	    fi
         # and weirdnesses:
@@ -431,7 +434,7 @@ diagnostics() {
 			echo "User ID '$uid' is expired!"
 			# FIXME: recommend a way to resolve this
 		    elif (( "$expire" < "$warndate" )); then
-			echo "User ID '$uid' expires in less than $warnwindow"
+			echo "User ID '$uid' expires in less than $warnwindow:" $(date -d "$(( $expire - $curdate )) seconds" +%F)		
 			# FIXME: recommend a way to resolve this
 		    fi
 		fi