From d89ba1692aba4329773ec437f642b19480532c59 Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 26 May 2015 15:25:51 +0200
Subject: [PATCH] Feature #3650: Use NebulaTemplate to set the default value of
 DEFAULT_AUTH

---
 src/nebula/NebulaTemplate.cc | 7 +++++++
 src/um/UserPool.cc           | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc
index 1741404ae2..876310daf0 100644
--- a/src/nebula/NebulaTemplate.cc
+++ b/src/nebula/NebulaTemplate.cc
@@ -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";
 
diff --git a/src/um/UserPool.cc b/src/um/UserPool.cc
index 1400b66690..808d8c829b 100644
--- a/src/um/UserPool.cc
+++ b/src/um/UserPool.cc
@@ -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);