From 239ed2493c3393dd205df574be77289e5577426e Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Mon, 26 Jul 2010 15:02:36 +0200 Subject: [PATCH] cleaned options and added --no-hash to oneuser --- src/cli/oneuser | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/cli/oneuser b/src/cli/oneuser index 576a5ee918..5802dac6b6 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -120,10 +120,16 @@ EOT table=ShowTable.new(ShowTableUP) table.print_help end - + + def special_options(opts, options) + opts.on_tail("-n", "--no-hash", "Store plain password "<< + "into the database") do |o| + options[:no_hash]=true + end + end end -oneup_opts=OneUPParse.new +oneup_opts=OneUPParse.new([:list]) oneup_opts.parse(ARGV) ops=oneup_opts.options @@ -136,8 +142,12 @@ when "create" check_parameters("create", 2) user=OpenNebula::User.new( OpenNebula::User.build_xml, get_one_client) - sha_password = Digest::SHA1.hexdigest(ARGV[1]) - result=user.allocate(ARGV[0],sha_password) + if ops[:no_hash] + sha_password = ARGV[1] + else + sha_password = Digest::SHA1.hexdigest(ARGV[1]) + end + result=user.allocate(ARGV[0], sha_password) if !OpenNebula.is_error?(result) puts "ID: " + user.id.to_s if ops[:verbose] exit 0