From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Fri, 20 Feb 2009 03:39:00 +0000 (-0500)
Subject: remove import_subkey from monkeysphere usage and man page until we get
X-Git-Tag: monkeysphere_0.23~34^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=21e298b8df5108b1337d66ba1a39184be4ce0e4e;p=monkeysphere.git

remove import_subkey from monkeysphere usage and man page until we get
a chance to fully implement it.
---

diff --git a/man/man1/monkeysphere.1 b/man/man1/monkeysphere.1
index 345e1d8..887b5df 100644
--- a/man/man1/monkeysphere.1
+++ b/man/man1/monkeysphere.1
@@ -56,14 +56,6 @@ ID, 1 if no matching keys were found at all, and 2 if matching keys
 were found but none were acceptable.  `a' may be used in place of
 `update-authorized_keys'.
 .TP
-.B import-subkey FILE [KEYID]
-Import an existing ssh RSA key as an authentication subkey for a
-private key in your GnuPG keyring.  KEYID is the key ID for the
-primary key for which the subkey with "authentication" capability will
-be imported.  If no key ID is specified, but only one key exists in
-the secret keyring, that key will be used.  `i' may be used in place
-of `import-subkey'.
-.TP
 .B gen-subkey [KEYID]
 Generate an authentication subkey for a private key in your GnuPG
 keyring.  KEYID is the key ID for the primary key for which the subkey
diff --git a/src/monkeysphere b/src/monkeysphere
index cac9a02..a65cef6 100755
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -45,7 +45,6 @@ Monkeysphere client tool.
 subcommands:
  update-known_hosts (k) [HOST]...    update known_hosts file
  update-authorized_keys (a)          update authorized_keys file
- import-subkey (i) FILE [KEYID]      import existing ssh key as gpg subkey
  gen-subkey (g) [KEYID]              generate an authentication subkey
    --length (-l) BITS                  key length in bits (2048)
  ssh-proxycommand                    monkeysphere ssh ProxyCommand
diff --git a/src/share/m/import_subkey b/src/share/m/import_subkey
index 1823f71..7333f80 100644
--- a/src/share/m/import_subkey
+++ b/src/share/m/import_subkey
@@ -19,6 +19,9 @@ import_subkey() {
     local gpgSecOut
     local fifoDir
 
+    # FIXME: implement!
+    failure "implement me!"
+
     sshKeyFile="$1"
     shift
 
@@ -33,9 +36,6 @@ import_subkey() {
     # check that an authentication subkey does not already exist
     check_gpg_authentication_subkey "$keyID"
 
-    # FIXME: implement!
-    failure "implement me!"
-
     # setup the temp fifo dir for retrieving the key password
     log debug "creating password fifo..."
     fifoDir=$(msmktempdir)