X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fcommon;h=9d7deb7c6251c7ab989f53b49e29fc6e69b6971d;hb=d78a6e30ed3bc408e6a43077b4024597dfb810bd;hp=9a03b9ca8df08430bd64c894b1c5cc3612252990;hpb=cbcc9ff2a7cf6b398a977a873c5c85db36ba05fd;p=monkeysphere.git

diff --git a/src/common b/src/common
index 9a03b9c..9d7deb7 100644
--- a/src/common
+++ b/src/common
@@ -83,6 +83,28 @@ gpg_escape() {
     sed 's/:/\\x3a/g'
 }
 
+# prompt for GPG-formatted expiration, and emit result on stdout
+get_gpg_expiration() {
+    local keyExpire=
+
+    cat >&2 <<EOF
+Please specify how long the key should be valid.
+         0 = key does not expire
+      <n>  = key expires in n days
+      <n>w = key expires in n weeks
+      <n>m = key expires in n months
+      <n>y = key expires in n years
+EOF
+    while [ -z "$keyExpire" ] ; do
+	read -p "Key is valid for? (0) " keyExpire
+	if ! test_gpg_expire ${keyExpire:=0} ; then
+	    echo "invalid value" >&2
+	    unset keyExpire
+	fi
+    done
+    echo "$keyExpire"
+}
+
 # remove all lines with specified string from specified file
 remove_line() {
     local file
@@ -403,7 +425,7 @@ process_user_id() {
 		# if the user ID does matches...
 		if [ "$(echo "$uidfpr" | gpg_unescape)" = "$userID" ] ; then
 		    # and the user ID validity is ok
-		    if [ "$validity" != 'u' -a "$validity" != 'f' ] ; then
+		    if [ "$validity" = 'u' -o "$validity" = 'f' ] ; then
 			# mark user ID acceptable
 			uidOK=true
 		    fi