tweak/cleanup some of the prompts.

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index f2cadf20b37dff6d9ddc2d42bcd79fc900ecbd37..a48db6481909a070d7e73c9defc9bbe25538c63b 100644 (file)
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -126,8 +126,8 @@ else
     gpg_sphere "--fingerprint 0x${fingerprint}!"
 
     if [ "$PROMPT" = "true" ] ; then
-       echo "Are you sure you want to add the above key as a"
-       read -p "certifier of users on this system? (Y/n) " OK; OK=${OK:-Y}
+       echo "Are you sure you want to add the above key as a certifier"
+       read -p "of users on this system? (Y/n) " OK; OK=${OK:-Y}
        if [ "${OK/y/Y}" != 'Y' ] ; then
            failure "Identity certifier not added."
        fi

diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index a9a1451159ba4c5b6a18897f85f6331cdda21416..6c90358bc2c54c6552caa5a91fc0cfa74eaa593e 100644 (file)
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -27,7 +27,7 @@ fi
 gpg_core --list-key --fingerprint "0x${keyID}!" || failure
 
 if [ "$PROMPT" = "true" ] ; then
-    read -p "Really remove the identity certifier above? (Y/n) " OK; OK=${OK:-Y}
+    read -p "Really remove the above listed identity certifier? (Y/n) " OK; OK=${OK:-Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then
        failure "Identity certifier not removed."
     fi

diff --git a/src/share/mh/add_hostname b/src/share/mh/add_hostname
index 0da6a0655ea3063b2548082050271bea29d4d57f..ec741ee5a114f8eb99cfc3e99f15d6a202c91a18 100644 (file)
--- a/src/share/mh/add_hostname
+++ b/src/share/mh/add_hostname
@@ -32,8 +32,10 @@ find_host_userid > /dev/null && \
     failure "Host userID '$userID' already exists."
 
 if [ "$PROMPT" = "true" ] ; then
-    echo "The following user ID will be added to the host key:"
-    echo "  $userID"
+    cat <<EOF
+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}
     if [ "${OK/y/Y}" != 'Y' ] ; then
        failure "User ID not added."

diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 428b95834927e840c145147478ac970a8ce16410..18ad2b7a8f8a76b117fa2ff208063f8be65cdd32 100644 (file)
--- 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

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index 040b41c57140862760b9e10dcac2189bdcb44f65..7c11890d6c0306bd6a54816c8d55c34e1dabeca1 100644 (file)
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -44,6 +44,21 @@ fi
 
 userID="ssh://${hostName}"
 
+if [ "$PROMPT" = "true" ] ; then
+    cat <<EOF
+The ssh key will be imported and an OpenPGP certificate for this host
+will be generated with the following user ID:
+  $userID
+EOF
+    read -p "Are you sure you would like to create certificate? [Y/n] " OK; OK=${OK:-Y}
+    if [ "${OK/y/Y}" != 'Y' ] ; then
+       failure "revoker not added."
+    fi
+else
+    log debug "importing key without prompting."
+fi
+
+
 # create host home
 mkdir -p "${MHDATADIR}"
 mkdir -p "${GNUPGHOME_HOST}"

diff --git a/src/share/mh/revoke_hostname b/src/share/mh/revoke_hostname
index 71b56ed2327fe936312eff438a45f29e283f96b8..12158287d47d490d045fb1530cb5fa46cf73e72d 100644 (file)
--- a/src/share/mh/revoke_hostname
+++ b/src/share/mh/revoke_hostname
@@ -43,9 +43,11 @@ uidIndex=$(find_host_userid) || \
     failure "No non-revoked user ID found matching '$userID'."
 
 if [ "$PROMPT" = "true" ] ; then
-    echo "The following host key user ID will be revoked:"
-    echo "  $userID"
-    read -p "Are you sure you would like to revoke this user ID? (N/y) " OK; OK=${OK:=Y}
+    cat <<EOF
+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}
     if [ "${OK/y/Y}" != 'Y' ] ; then
        failure "User ID not revoked."
     fi