From c8d45c9985cf60109db9c76e4df1693f74c12824 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Fri, 2 Sep 2011 16:14:14 +0200 Subject: [PATCH] feature #788: Changed description of oneuser key command. Do not hash x509 passwords --- src/cli/one_helper/oneuser_helper.rb | 2 +- src/cli/oneuser | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/one_helper/oneuser_helper.rb b/src/cli/one_helper/oneuser_helper.rb index a9acaf3d46..bca7a4c27c 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -37,7 +37,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper return -1, "Can not read file: #{arg}" end else - if options[:plain] || options[:ssh] + if options[:plain] || options[:ssh] || options[:x509] password = arg.gsub(/\s/, '') else password = Digest::SHA1.hexdigest(arg) diff --git a/src/cli/oneuser b/src/cli/oneuser index 531db2b15e..bab3cf787c 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -177,7 +177,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do end key_desc = <<-EOT.unindent - Generates a public key from a private SSH key + Shows a public key from a private SSH key. Use it as password for the SSH authentication mechanism. EOT command :key, key_desc, :options=>[KEY] do