diff options
| author | rmsousa <rmsousa@chromium.org> | 2014-09-29 14:17:55 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-29 21:20:31 +0000 |
| commit | 665bf309b93ea3c96c22ce75600beb40e2c083cb (patch) | |
| tree | 7fb7d0f9c784da2d39ff5bda5c38ae287d8ea0b7 /remoting/host/host_config.h | |
| parent | 657073100664172d14d61e92e1e4c36fc7024e5d (diff) | |
| download | chromium_src-665bf309b93ea3c96c22ce75600beb40e2c083cb.zip chromium_src-665bf309b93ea3c96c22ce75600beb40e2c083cb.tar.gz chromium_src-665bf309b93ea3c96c22ce75600beb40e2c083cb.tar.bz2 | |
Save the client base JID for authentication in case it differs from the email (for accounts non-Google email). Keep a separate email field for use in user-facing UIs, logs, etc. Using the existing host_owner field for the base JID guarantees the correct *functional* behavior (i.e. authentication-wise) if the new config is used with an older host (the only difference is aesthetic - in that older host some UI/logs may show an uglier address instead of the user email).
BUG=224742
Review URL: https://codereview.chromium.org/595063005
Cr-Commit-Position: refs/heads/master@{#297269}
Diffstat (limited to 'remoting/host/host_config.h')
| -rw-r--r-- | remoting/host/host_config.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/remoting/host/host_config.h b/remoting/host/host_config.h index 19332b3..17e554f 100644 --- a/remoting/host/host_config.h +++ b/remoting/host/host_config.h @@ -19,9 +19,11 @@ namespace remoting { // Status of the host, whether it is enabled or disabled. extern const char kHostEnabledConfigPath[]; -// Google account of the owner of this host. +// Base JID of the host owner (may not equal the email for non-gmail users). extern const char kHostOwnerConfigPath[]; -// Login used to authenticate in XMPP network. +// Email of the owner of this host. +extern const char kHostOwnerEmailConfigPath[]; +// Login used to authenticate in XMPP network (could be a service account). extern const char kXmppLoginConfigPath[]; // Auth token used to authenticate to XMPP network. extern const char kXmppAuthTokenConfigPath[]; |