From eab1dd6f84a5fb861c6dffda91bc0d742108a580 Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Wed, 10 Feb 2016 17:37:52 -0500
Subject: [PATCH] MGR and client: Add more missing code from the cookieless
 install merge.

---
 client/gui_rpc_server_ops.cpp | 2 +-
 lib/gui_rpc_client_ops.cpp    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index 8d77cae3b1..f20aee2dc8 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -779,7 +779,7 @@ void handle_lookup_account(GUI_RPC_CONN& grc) {
     MIOFILE in;
 
     ai.parse(grc.xp);
-    if (!ai.url.size() || !ai.email_addr.size() || !ai.passwd_hash.size()) {
+	if ((!ai.url.size() || !ai.email_addr.size() || !ai.passwd_hash.size()) && !ai.server_assigned_hash) {
         grc.mfout.printf("<error>missing URL, email address, or password</error>\n");
         return;
     }
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index eebed41e81..f9941bc740 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -2279,11 +2279,15 @@ int RPC_CLIENT::lookup_account(ACCOUNT_IN& ai) {
         "   <email_addr>%s</email_addr>\n"
         "   <passwd_hash>%s</passwd_hash>\n"
         "   <ldap_auth>%d</ldap_auth>\n"
+		"   <server_assigned_hash>%d</server_assigned_hash>\n"
+		"   <server_hash>%s</server_hash>\n"
         "</lookup_account>\n",
         ai.url.c_str(),
         ai.email_addr.c_str(),
         passwd_hash.c_str(),
-        ai.ldap_auth?1:0
+        ai.ldap_auth?1:0,
+		ai.server_assigned_hash?1:0,
+	    ai.server_hash.c_str()
     );
     buf[sizeof(buf)-1] = 0;