From ec533433fd5ef49c2347f0198d6452913fdc313c Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 27 Jul 2012 22:17:05 +0200 Subject: [PATCH] bug #1396. Deprecate key command and upload fix as proposed by Rogier Mars --- src/cli/oneuser | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/cli/oneuser b/src/cli/oneuser index 74d1e98895..49ac9c01f8 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -221,9 +221,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do Creates the Login token for authentication Examples: oneuser login my_user --ssh --key /tmp/id_rsa --time 72000 - oneuser login my_user --x509 --cert /tmp/my_cert.pem \ + oneuser login my_user --x509 --cert /tmp/my_cert.pem --key /tmp/my_key.pk --time 72000 - oneuser login my_user --x509_proxy --proxy /tmp/my_cert.pem \ + oneuser login my_user --x509_proxy --proxy /tmp/my_cert.pem --time 72000 EOT @@ -232,6 +232,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do end key_desc = <<-EOT.unindent + DEPRECATED, use login to generate auth files. + Shows a public key from a private SSH key. Use it as password for the SSH authentication mechanism. EOT @@ -247,7 +249,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do exit_with_code -1, e.message end - puts sshauth.public_key + puts sshauth.password exit_with_code 0 end