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

Feature #3650: Use NebulaTemplate to set the

Browse Source 
default value of DEFAULT_AUTH
This commit is contained in:
Jaime Melis 2015-05-26 15:25:51 +02:00
parent aa43470233
commit d89ba1692a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/nebula/NebulaTemplate.cc
View File

@ -356,11 +356,18 @@ void OpenNebulaTemplate::set_conf_default()
#*******************************************************************************
# Auth Manager Configuration
#*******************************************************************************
# DEFAULT_AUTH
# SESSION_EXPIRATION_TIME
# ENABLE_OTHER_PERMISSIONS
# DEFAULT_UMASK
#*******************************************************************************
*/
// DEFAULT_AUTH
value = "default";
attribute = new SingleAttribute("DEFAULT_AUTH",value);
conf_default.insert(make_pair(attribute->name(),attribute));
// SESSION_EXPIRATION_TIME
value = "0";

5
src/um/UserPool.cc
View File

@ -736,11 +736,6 @@ bool UserPool::authenticate_external(const string& username,
//Initialize authentication request and call the driver
nd.get_configuration_attribute("DEFAULT_AUTH",default_auth);
if (default_auth.empty())
{
default_auth = "default";
}
ar.add_authenticate(default_auth, username,"-",token);
authm->trigger(AuthManager::AUTHENTICATE, &ar);