From db6be6454c57e914efcc91cd695bdac7609dd301 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Sat, 21 Mar 2015 17:20:48 +0100 Subject: [PATCH] bug #3704: session tokens are correctly stored --- src/cli/one_helper/oneuser_helper.rb | 2 +- src/um/LoginToken.cc | 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 2cb318307f..e1a9800b14 100644 --- a/src/cli/one_helper/oneuser_helper.rb +++ b/src/cli/one_helper/oneuser_helper.rb @@ -179,7 +179,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper user = OpenNebula::User.new(User.build_xml, login_client) - token_oned = user.login(username, token, options[:time]) + token_oned = user.login(username, "", options[:time]) return -1, token_oned.message if OpenNebula.is_error?(token_oned) diff --git a/src/um/LoginToken.cc b/src/um/LoginToken.cc index a0f4813932..90dba50346 100644 --- a/src/um/LoginToken.cc +++ b/src/um/LoginToken.cc @@ -46,7 +46,7 @@ const std::string& LoginToken::set(const std::string& user_token, time_t valid) expiration_time = 0; } - if (user_token.empty()) + if (!user_token.empty()) { token = user_token; }