From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 25 Jul 2008 18:15:51 +0000 (-0400)
Subject: allowing expiration dates with strings longer than one digit (e.g. "10m" meaning... 
X-Git-Tag: monkeysphere_0.5-1~17
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=27886befbbb9d890284871acc5a3a36ff61e3e19

allowing expiration dates with strings longer than one digit (e.g. "10m" meaning "10 months")
---

diff --git a/src/common b/src/common
index 6fc5f33..b57b721 100644
--- a/src/common
+++ b/src/common
@@ -115,7 +115,7 @@ translate_ssh_variables() {
 
 # test that a string to conforms to GPG's expiration format
 test_gpg_expire() {
-    echo "$1" | egrep -q "^[0-9][mwy]?$"
+    echo "$1" | egrep -q "^[0-9]+[mwy]?$"
 }
 
 # check that a file is properly owned, and that all it's parent