X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=userdir_gpg.py;fp=userdir_gpg.py;h=273ac47a081a1290cf0527abf2b26dbe85637981;hp=9b497b29a88510fdcd8970f8d1f70563ae542dd0;hb=86a2cb531c55baec854944024f243e4d9def08e9;hpb=c0d17c415af9716cca033e6dab59aaa4d713c06e

diff --git a/userdir_gpg.py b/userdir_gpg.py
index 9b497b2..273ac47 100644
--- a/userdir_gpg.py
+++ b/userdir_gpg.py
@@ -368,10 +368,15 @@ def GPGCheckSig(Message):
             Why = "Unable to verify signature, signing key missing.";
 
 	 # Expired signature
-	 if Split[1] == "SIGEXPIRED" or Split[1] == "EXPSIG":
+	 if Split[1] == "EXPSIG":
 	    GoodSig = 0;
             Why = "Signature has expired";
-	    
+
+	 # Expired signature
+	 if Split[1] == "EXPKEYSIG":
+	    GoodSig = 0;
+            Why = "Signing key (%s, %s) has expired"%(Split[2], Split[3]);
+
 	 # Revoked key
 	 if Split[1] == "KEYREVOKED" or Split[1] == "REVKEYSIG":
 	    GoodSig = 0;