From cd4c36070c85283086ed914d8fd6ac77884173bb Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Fri, 20 Feb 2009 14:26:15 -0500
Subject: tweak/cleanup some of the prompts.

---
 src/share/mh/add_revoker | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/share/mh/add_revoker')

diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 428b958..18ad2b7 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -80,8 +80,8 @@ else
     su_monkeysphere_user "GNUPGHOME=$tmpDir gpg --fingerprint 0x${fingerprint}!"
 
     if [ "$PROMPT" = "true" ] ; then
-	echo "Are you sure you want to add the above key as a"
-	read -p "revoker of the host key? (Y/n) " OK; OK=${OK:-Y}
+	echo "Are you sure you want to add the above key as a revoker"
+	read -p "of the host key? (Y/n) " OK; OK=${OK:-Y}
 	if [ "${OK/y/Y}" != 'Y' ] ; then
 	    failure "revoker not added."
 	fi
-- 
cgit v1.2.3


From 6e371ad70b96003d50c769a2d2f6fd82c15d4bb5 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 21 Feb 2009 16:16:58 -0500
Subject: add tests to add_revoker and add_certifier that more than one key was
 not found when adding by using key ID.

---
 src/share/ma/add_certifier | 12 +++++++++++-
 src/share/mh/add_revoker   | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'src/share/mh/add_revoker')

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index a48db64..eba6893 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -120,7 +120,17 @@ else
     # get the full fingerprint of new certifier key
     log debug "getting fingerprint of certifier key..."
     fingerprint=$(gpg_sphere "--list-key --with-colons --with-fingerprint 0x${keyID}!" \
-	| grep '^fpr:' | grep "$keyID" | cut -d: -f10)
+	| grep '^fpr:' | cut -d: -f10)
+
+    # test that there is only a single fingerprint
+    if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
+	cat <<EOF
+More than one fingerprint found:
+  echo $fingerprint
+Please use a more specific key ID.
+EOF
+	failure
+    fi
 
     log info "key found:"
     gpg_sphere "--fingerprint 0x${fingerprint}!"
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 18ad2b7..50e8c67 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -74,7 +74,17 @@ else
     # get the full fingerprint of new revoker key
     log debug "getting fingerprint of revoker key..."
     fingerprint=$(su_monkeysphere_user "GNUPGHOME=$tmpDir gpg --list-key --with-colons --with-fingerprint 0x${keyID}!" \
-	| grep '^fpr:' | grep "$keyID" | cut -d: -f10)
+	| grep '^fpr:' | cut -d: -f10)
+
+    # test that there is only a single fingerprint
+    if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
+	cat <<EOF
+More than one fingerprint found:
+  echo $fingerprint
+Please use a more specific key ID.
+EOF
+	failure
+    fi
 
     log info "key found:"
     su_monkeysphere_user "GNUPGHOME=$tmpDir gpg --fingerprint 0x${fingerprint}!"
-- 
cgit v1.2.3


From 3c73575de77e8d4d211258641179c71080b56856 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 21 Feb 2009 16:29:35 -0500
Subject: fix output formatting for cases where multiple fingerprints are
 found, in functions that are doing that sort of thing

---
 src/monkeysphere           | 4 +---
 src/share/ma/add_certifier | 2 +-
 src/share/mh/add_revoker   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/share/mh/add_revoker')

diff --git a/src/monkeysphere b/src/monkeysphere
index 0d8f4ff..fd96f45 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -87,9 +87,7 @@ check_gpg_sec_key_id() {
 	    ;;
 	*)
 	    echo "Multiple primary secret keys found:"
-	    for key in $(echo "$gpgSecOut" | cut -d: -f5) ; do
-		echo "  $key"
-	    done
+	    echo "$gpgSecOut" | cut -d: -f5
 	    echo "Please specify which primary key to use."
 	    failure
 	    ;;
diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index eba6893..6f85ecf 100644
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -126,7 +126,7 @@ else
     if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
 	cat <<EOF
 More than one fingerprint found:
-  echo $fingerprint
+$fingerprint
 Please use a more specific key ID.
 EOF
 	failure
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 50e8c67..2ae531e 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -80,7 +80,7 @@ else
     if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
 	cat <<EOF
 More than one fingerprint found:
-  echo $fingerprint
+$fingerprint
 Please use a more specific key ID.
 EOF
 	failure
-- 
cgit v1.2.3


From ac1e7db655c4be2f51511bdc967cdf16bf2560e7 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Sat, 21 Feb 2009 16:48:30 -0500
Subject: make sure all prompt messages are going to stderr

---
 src/monkeysphere             | 2 +-
 src/share/mh/add_hostname    | 6 ++----
 src/share/mh/add_revoker     | 4 ++--
 src/share/mh/revoke_hostname | 6 ++----
 4 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'src/share/mh/add_revoker')

diff --git a/src/monkeysphere b/src/monkeysphere
index fd96f45..371983f 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -122,7 +122,7 @@ check_gpg_authentication_subkey() {
 	fi
 	# if authentication key is valid, prompt to continue
 	if [ "$validity" = 'u' ] ; then
-	    echo "A valid authentication key already exists for primary key '$keyID'."
+	    echo "A valid authentication key already exists for primary key '$keyID'." 1>&2
 	    if [ "$PROMPT" = "true" ] ; then
 		read -p "Are you sure you would like to generate another one? (y/N) " OK; OK=${OK:N}
 		if [ "${OK/y/Y}" != 'Y' ] ; then
diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index ec741ee..b08d688 100644
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -32,11 +32,9 @@ find_host_userid > /dev/null && \
     failure "Host userID '$userID' already exists."
 
 if [ "$PROMPT" = "true" ] ; then
-    cat <<EOF
-The following user ID will be added to the host key:
+    read -p "The following user ID will be added to the host key:
   $userID
-EOF
-    read -p "Are you sure you would like to add this user ID? (Y/n) " OK; OK=${OK:=Y}
+Are you sure you would like to add this user ID? (Y/n) " OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "User ID not added."
     fi
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 2ae531e..03ae56f 100644
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -90,8 +90,8 @@ EOF
     su_monkeysphere_user "GNUPGHOME=$tmpDir gpg --fingerprint 0x${fingerprint}!"
 
     if [ "$PROMPT" = "true" ] ; then
-	echo "Are you sure you want to add the above key as a revoker"
-	read -p "of the host key? (Y/n) " OK; OK=${OK:-Y}
+	read -p "Are you sure you want to add the above key as a revoker
+of the host key? (Y/n) " OK; OK=${OK:-Y}
 	if [ "${OK/y/Y}" != 'Y' ] ; then
 	    failure "revoker not added."
 	fi
diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 1215828..2142af7 100644
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -43,11 +43,9 @@ uidIndex=$(find_host_userid) || \
     failure "No non-revoked user ID found matching '$userID'."
 
 if [ "$PROMPT" = "true" ] ; then
-    cat <<EOF
-The following host key user ID will be revoked:
+    read -p "The following host key user ID will be revoked:
   $userID
-EOF
-    read -p "Are you sure you would like to revoke this user ID? (Y/n) " OK; OK=${OK:=Y}
+Are you sure you would like to revoke this user ID? (Y/n) " OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
 	failure "User ID not revoked."
     fi
-- 
cgit v1.2.3