X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere;h=9b315e26ae8ee46c7303449390c680f7f5252f7b;hb=e8ac612c4bad88172c5e80fa7e813664e536a6f8;hp=a433701a1c6fb4da462e9b29bdd6bae6e4d644db;hpb=1fa2912aac2636bc6a4d8eda089c0e285f88d141;p=monkeysphere.git

diff --git a/src/monkeysphere b/src/monkeysphere
index a433701..9b315e2 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -54,14 +54,30 @@ gen_subkey(){
     gpgOut=$(gpg --quiet --fixed-list-mode --list-keys --with-colons \
 	"$keyID" 2> /dev/null)
 
-    # return 1 if there only "tru" lines are output from gpg
+    # fail if there only "tru" lines are output from gpg, which
+    # indicates the key was not found.
     if [ -z "$(echo "$gpgOut" | grep -v '^tru:')" ] ; then
 	failure "Key ID '$keyID' not found."
     fi
 
+    # fail if multiple pub lines are returned, which means the id given
+    # is not unique
+    if [ $(echo "$gpgOut" | grep '^pub:' | wc -l) -gt '1' ] ; then
+	failure "Key ID '$keyID' is not unique."
+    fi
+
+    # prompt if an authentication subkey already exists
+    if echo "$gpgOut" | egrep "^(pub|sub):" | cut -d: -f 12 | grep -q a ; then
+	echo "An authentication subkey already exists for key '$keyID'."
+	read -p "Are you sure you would like to generate another one? [y|N]: " OK; OK=${OK:N}
+	if [ "${OK/y/Y}" != 'Y' ] ; then
+	    failure "aborting."
+	fi
+    fi
+
     # set subkey defaults
     SUBKEY_TYPE=${SUBKEY_TYPE:-"RSA"}
-    #SUBKEY_LENGTH=${SUBKEY_LENGTH:-"2048"}
+    SUBKEY_LENGTH=${SUBKEY_LENGTH:-}
     SUBKEY_USAGE=${SUBKEY_USAGE:-"auth"}
     SUBKEY_EXPIRE=${SUBKEY_EXPIRE:-"0"}
     cat <<EOF
@@ -140,12 +156,9 @@ case $COMMAND in
         # if hosts are specified on the command line, process just
         # those hosts
 	if [ "$1" ] ; then
-            for host ; do
-		process_host_known_hosts "$host"
-	    done
-	    log "known_hosts file updated."
+	    process_hosts_known_hosts "$@"
 
-        # otherwise, if no hosts are specified, process every user
+        # otherwise, if no hosts are specified, process every host
         # in the user's known_hosts file
 	else
 	    if [ ! -s "$KNOWN_HOSTS" ] ; then
@@ -153,8 +166,9 @@ case $COMMAND in
 	    fi
 	    log "processing known_hosts file..."
 	    process_known_hosts
-	    log "known_hosts file updated."
 	fi
+
+	log "known_hosts file updated."
 	;;
 
     'update-authorized_keys'|'update-authorized-keys'|'a')