From 02bd5ec4efeda92b90d1a61adefa6e1fb4ffc93e Mon Sep 17 00:00:00 2001
From: Ted <tdh@camp5.townhouse>
Date: Mon, 29 Aug 2011 16:32:04 -0500
Subject: [PATCH] Remove restriction for plain auth for oneadmin. (cherry
 picked from commit ff05d07af0231ae4a2e8a0915973c05f9b533409)

---
 src/um/UserPool.cc | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/um/UserPool.cc b/src/um/UserPool.cc
index 746e898346..2ab1618f42 100644
--- a/src/um/UserPool.cc
+++ b/src/um/UserPool.cc
@@ -250,23 +250,12 @@ bool UserPool::authenticate(const string& session,
     }
 
     AuthRequest ar(uid, gid);
+    
+    NebulaLog::log("UserPool",Log::ERROR, "Authenticating " + username);
 
     ar.add_authenticate(username,u_pass,secret);
 
-    if ( uid == 0 ) //oneadmin
-    {
-        if (ar.plain_authenticate())
-        {
-            user_id  = uid;
-            group_id = gid;
-
-            uname = tuname;
-            gname = tgname;
-
-            result   = true;
-        }
-    }
-    else if (authm == 0) //plain auth
+    if (authm == 0) //plain auth
     {
         if ( user != 0 && ar.plain_authenticate()) //no plain for external users
         {