shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'master' of git@git.opennebula.org:one

Browse Source
This commit is contained in:
Daniel 2011-11-23 02:41:59 -08:00
commit 4d3bc39743
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli/one_helper/oneuser_helper.rb
View File

@ -37,7 +37,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
return -1, "Can not read file: #{arg}"
end
else
password = arg
password = arg.dup
end
if options[:driver] == OpenNebula::User::X509_AUTH

11
src/sunstone/models/OpenNebulaJSON/UserJSON.rb
View File

@ -26,9 +26,9 @@ module OpenNebulaJSON
return user_hash
end
password = Digest::SHA1.hexdigest(user_hash['password'])
self.allocate(user_hash['name'], password, user_hash['auth_driver'])
self.allocate(user_hash['name'],
user_hash['password'],
user_hash['auth_driver'])
end
def perform_action(template_json)
@ -40,7 +40,7 @@ module OpenNebulaJSON
rc = case action_hash['perform']
when "passwd" then self.passwd(action_hash['params'])
when "chgrp" then self.chgrp(action_hash['params'])
when "chauth" then self.chauth(action_hash['params'])
when "chauth" then self.chauth(action_hash['params'])
when "update" then self.update(action_hash['params'])
when "addgroup" then self.addgroup(action_hash['params'])
when "delgroup" then self.delgroup(action_hash['params'])
@ -52,8 +52,7 @@ module OpenNebulaJSON
end
def passwd(params=Hash.new)
password = Digest::SHA1.hexdigest(params['password'])
super(password)
super(params['password'])
end
def chgrp(params=Hash.new)