From e93a298ec6f9abd80e30a933b0dd84c764d11bff Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 16 Feb 2009 21:28:32 -0500
Subject: REMOVE GEN_KEY.  The gen_key function is entirely removed.  Decided
 this was OK now that import_key works, and we can't really see a reason to
 keep it around.  We can resurect it down the line if need be.  Also, removed
 "expert" subcommand, after promting import_key, since it may be need
 semi-regularly.  The other "expert" commands are now just not listed in the
 usage.

---
 src/monkeysphere-host | 53 +++++++++++----------------------------------------
 1 file changed, 11 insertions(+), 42 deletions(-)

(limited to 'src/monkeysphere-host')

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 64023e0..2e69d41 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -66,12 +66,12 @@ subcommands:
  revoke-key (r)                      revoke host key
  publish-key (p)                     publish host key to keyserver
 
- expert <expert-subcommand>          run expert command
- expert help                         expert command help
+ import-key (i) [NAME[:PORT]]        import existing ssh key to gpg
 
  version (v)                         show version number
  help (h,?)                          this help
 
+See ${PGRM}(8) for more info.
 EOF
 }
 
@@ -269,47 +269,16 @@ case $COMMAND in
 	publish_key
 	;;
 
-    'expert')
-	SUBCOMMAND="$1"
-	shift
-	case "$SUBCOMMAND" in
-	    'help'|'h'|'?')
-		cat <<EOF
-usage: $PGRM expert <subcommand> [options] [args]
-
-expert subcommands:
- import-key (i) [NAME[:PORT]]        import existing ssh key to gpg
- gen-key (g) [NAME[:PORT]]           generate gpg key for the host
-   --length (-l) BITS                  key length in bits (2048)
- diagnostics (d)                     monkeysphere host status
+    'import-key'|'i')
+	load_fingerprint
+	check_host_key
+	source "${MHSHAREDIR}/import_key"
+	import_key "$@"
+	;;
 
-EOF
-		;;
-
-	    'import-key'|'i')
-		load_fingerprint
-		check_host_key
-		source "${MHSHAREDIR}/import_key"
-		import_key "$@"
-		;;
-
-	    'gen-key'|'g')
-		load_fingerprint
-		check_host_key
-		source "${MHSHAREDIR}/gen_key"
-		gen_key "$@"
-		;;
-
-	    'diagnostics'|'d')
-		source "${MHSHAREDIR}/diagnostics"
-		diagnostics
-		;;
-
-	    *)
-		failure "Unknown expert subcommand: '$COMMAND'
-Type '$PGRM help' for usage."
-		;;
-	esac
+    'diagnostics'|'d')
+	source "${MHSHAREDIR}/diagnostics"
+	diagnostics
 	;;
 
     'version'|'v')
-- 
cgit v1.2.3