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

Revert "Feature #552: one.user.authenticate method now returns the User ID"

Browse Source 
This reverts commit fd6a54392bf26c1891620910b742ca8aa37ffba4.
This commit is contained in:
Carlos Martín 2011-04-11 18:46:10 +02:00
parent a5178b07c6
commit ae7842fed7
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/rm/RequestManagerUserAuthenticate.cc
View File

@ -26,12 +26,8 @@ void RequestManager::UserAuthenticate::execute(
xmlrpc_c::paramList const& paramList,
xmlrpc_c::value * const retval)
{
string session;
int uid;
ostringstream oss;
const string method_name = "UserAuthenticate";
string session;
int rc;
/* -- RPC specific vars -- */
vector<xmlrpc_c::value> arrayData;
@ -43,16 +39,10 @@ void RequestManager::UserAuthenticate::execute(
session = xmlrpc_c::value_string(paramList.getString(0));
// Try to authenticate the user
uid = UserAuthenticate::upool->authenticate(session);
if( uid == -1 )
{
goto error_common;
}
rc = UserAuthenticate::upool->authenticate(session);
//Result
arrayData.push_back(xmlrpc_c::value_boolean( true ));
arrayData.push_back(xmlrpc_c::value_int(uid));
arrayData.push_back(xmlrpc_c::value_boolean( rc == 0 ));
arrayresult = new xmlrpc_c::value_array(arrayData);
*retval = *arrayresult;
@ -60,19 +50,6 @@ void RequestManager::UserAuthenticate::execute(
delete arrayresult;
return;
error_common:
oss.str(authenticate_error(method_name));
arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE
arrayData.push_back(xmlrpc_c::value_string( authenticate_error(method_name) );
NebulaLog::log("ReM",Log::ERROR,oss);
xmlrpc_c::value_array arrayresult_error(arrayData);
*retval = arrayresult_error;
return;
}
/* -------------------------------------------------------------------------- */