From 274b7cd8e3f68fb93cf1c8667bdd23bb3af1ef33 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 19 Nov 2014 00:11:37 -0800
Subject: [PATCH] client/manager: more fixes for WCG attach problem.  Should
 work now.

---
 clientgui/ProjectProcessingPage.cpp | 2 +-
 lib/gui_rpc_client_ops.cpp          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp
index f16a8a7b4e..ff66a76af8 100644
--- a/clientgui/ProjectProcessingPage.cpp
+++ b/clientgui/ProjectProcessingPage.cpp
@@ -412,7 +412,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
                     ai->user_name = (const char*)::wxGetUserId().mb_str();
                 }
                 //ai->team_name = (const char*)pWA->GetTeamName().mb_str();
-                ai->uses_ldap = pWA->project_config.uses_ldap;
+                ai->ldap_auth = pWA->project_config.ldap_auth;
 
                 if (pWA->m_AccountInfoPage->m_pAccountCreateCtrl->GetValue()) {
 					creating_account = true;
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index c5daccdd3b..228cd179ed 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -1346,6 +1346,7 @@ int PROJECT_CONFIG::parse(XML_PARSER& xp) {
             platforms.push_back(msg);
             continue;
         }
+        if (xp.parse_bool("ldap_auth", ldap_auth)) continue;
     }
     return ERR_XML_PARSE;
 }
@@ -1366,6 +1367,7 @@ void PROJECT_CONFIG::clear() {
     sched_stopped = false;
     web_stopped = false;
     min_client_version = 0;
+    ldap_auth = false;
 }
 
 ACCOUNT_IN::ACCOUNT_IN() {