Save the client base JID for authentication in case it differs from the email (for accounts non-Goo…

remoting/host/win/elevated_controller.cc

Index: remoting/host/win/elevated_controller.cc
diff --git a/remoting/host/win/elevated_controller.cc b/remoting/host/win/elevated_controller.cc
index fc5aebe8da24e692fed790f00e59ad0ea8aded90..5fe4342dc0e3b328e3b3698f6a71d7ba0929d9f8 100644
--- a/remoting/host/win/elevated_controller.cc
+++ b/remoting/host/win/elevated_controller.cc
@@ -53,10 +53,12 @@ const char kUnprivilegedConfigFileSecurityDescriptor[] =
 const char kHostId[] = "host_id";
 const char kXmppLogin[] = "xmpp_login";
 const char kHostOwner[] = "host_owner";
+const char kHostOwnerEmail[] = "host_owner_email";

[Sergey Ulanov, 2014/09/25 02:28:46]

I'm not sure why these values need to be duplicated. Instead of duplicating
these values here I think you can just include remoting/host/host_config.h .
Somewhat unrelated to this CL, to feel free to ignore.

[rmsousa, 2014/09/27 01:42:17]

Done.

 const char kHostSecretHash[] = "host_secret_hash";
 
 // The configuration keys that cannot be specified in UpdateConfig().
-const char* const kReadonlyKeys[] = { kHostId, kHostOwner, kXmppLogin };
+const char* const kReadonlyKeys[] = {
+  kHostId, kHostOwner, kHostOwnerEmail, kXmppLogin };
 
 // The configuration keys whose values may be read by GetConfig().
 const char* const kUnprivilegedConfigKeys[] = { kHostId, kXmppLogin };
@@ -219,9 +221,11 @@ HRESULT WriteConfig(const char* content, size_t length, HWND owner_window) {
     return E_FAIL;
   }
   std::string email;
-  if (!config_dict->GetString(kHostOwner, &email)) {
-    if (!config_dict->GetString(kXmppLogin, &email)) {
-      return E_FAIL;
+  if (!config_dict->GetString(kHostOwnerEmail, &email)) {
+    if (!config_dict->GetString(kHostOwner, &email)) {
+      if (!config_dict->GetString(kXmppLogin, &email)) {
+        return E_FAIL;
+      }
     }
   }
   std::string host_id, host_secret_hash;