From 513bfa5d9067b992331ad3b42b8ac695a4693639 Mon Sep 17 00:00:00 2001
From: "Ruben S. Montero" <rubensm@dacya.ucm.es>
Date: Fri, 15 Oct 2010 18:18:34 +0200
Subject: [PATCH] Bug: User status is now return as 0/1 and not True/False.

---
 src/um/User.cc              |  4 +---
 src/um/test/UserPoolTest.cc | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/um/User.cc b/src/um/User.cc
index 6c2c077183..52a70f6bc1 100644
--- a/src/um/User.cc
+++ b/src/um/User.cc
@@ -216,14 +216,12 @@ int User::dump(ostringstream& oss, int num, char **values, char **names)
         return -1;
     }
 
-    string str_enabled = (atoi(values[ENABLED])==0)?"Fase":"True";
-
     oss <<
         "<USER>" <<
             "<ID>"      << values[OID]     <<"</ID>"      <<
             "<NAME>"    << values[USERNAME]<<"</NAME>"    <<
             "<PASSWORD>"<< values[PASSWORD]<<"</PASSWORD>"<<
-            "<ENABLED>" << str_enabled     <<"</ENABLED>" <<
+            "<ENABLED>" << values[ENABLED] <<"</ENABLED>" <<
         "</USER>";
 
     return 0;
diff --git a/src/um/test/UserPoolTest.cc b/src/um/test/UserPoolTest.cc
index fb79eb878d..81388609a0 100644
--- a/src/um/test/UserPoolTest.cc
+++ b/src/um/test/UserPoolTest.cc
@@ -32,24 +32,24 @@ const string passwords[] = { "A pass", "B pass", "C pass", "D pass", "E pass" };
 const string dump_result =
     "<USER_POOL><USER><ID>0</ID><NAME>one_user_test</NAME>"
     "<PASSWORD>5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8</PASSWORD>"
-    "<ENABLED>True</ENABLED></USER><USER><ID>1</ID><NAME>a</NAME>"
-    "<PASSWORD>p</PASSWORD><ENABLED>True</ENABLED></USER><USER>"
+    "<ENABLED>1</ENABLED></USER><USER><ID>1</ID><NAME>a</NAME>"
+    "<PASSWORD>p</PASSWORD><ENABLED>1</ENABLED></USER><USER>"
     "<ID>2</ID><NAME>a name</NAME><PASSWORD>pass</PASSWORD>"
-    "<ENABLED>True</ENABLED></USER><USER><ID>3</ID><NAME>a_name</NAME>"
-    "<PASSWORD>password</PASSWORD><ENABLED>True</ENABLED></USER><USER>"
+    "<ENABLED>1</ENABLED></USER><USER><ID>3</ID><NAME>a_name</NAME>"
+    "<PASSWORD>password</PASSWORD><ENABLED>1</ENABLED></USER><USER>"
     "<ID>4</ID><NAME>another name</NAME><PASSWORD>secret</PASSWORD>"
-    "<ENABLED>True</ENABLED></USER><USER><ID>5</ID><NAME>user</NAME>"
-    "<PASSWORD>1234</PASSWORD><ENABLED>True</ENABLED></USER>"
+    "<ENABLED>1</ENABLED></USER><USER><ID>5</ID><NAME>user</NAME>"
+    "<PASSWORD>1234</PASSWORD><ENABLED>1</ENABLED></USER>"
     "</USER_POOL>";
 
 const string dump_where_result =
     "<USER_POOL><USER><ID>1</ID><NAME>a</NAME>"
-    "<PASSWORD>p</PASSWORD><ENABLED>True</ENABLED></USER><USER>"
+    "<PASSWORD>p</PASSWORD><ENABLED>1</ENABLED></USER><USER>"
     "<ID>2</ID><NAME>a name</NAME><PASSWORD>pass</PASSWORD>"
-    "<ENABLED>True</ENABLED></USER><USER><ID>3</ID><NAME>a_name</NAME>"
-    "<PASSWORD>password</PASSWORD><ENABLED>True</ENABLED></USER><USER>"
+    "<ENABLED>1</ENABLED></USER><USER><ID>3</ID><NAME>a_name</NAME>"
+    "<PASSWORD>password</PASSWORD><ENABLED>1</ENABLED></USER><USER>"
     "<ID>4</ID><NAME>another name</NAME><PASSWORD>secret</PASSWORD>"
-    "<ENABLED>True</ENABLED></USER></USER_POOL>";
+    "<ENABLED>1</ENABLED></USER></USER_POOL>";
 
 class UserPoolTest : public PoolTest
 {