From 7213800115c2e07f8c20bd90078f0d4b0fe5b84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 2 Sep 2011 16:07:45 +0200 Subject: [PATCH] Feature #788: Change 'oneuser passwd' to accept a public ssh key --- src/cli/oneuser | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cli/oneuser b/src/cli/oneuser index 531db2b15e..49559db58e 100755 --- a/src/cli/oneuser +++ b/src/cli/oneuser @@ -212,15 +212,15 @@ cmd=CommandParser::CmdParser.new(ARGV) do command :passwd, passwd_desc, :userid, :password, :options=>create_options do - if options[:ssh] or options[:x509] + if args[1] + pass = args[1] + else rc = helper.password(options) if rc.first == 0 pass = rc[1] else exit_with_code *rc end - else - pass = args[1] end helper.perform_action(args[0],options,"Password changed") do |user|