diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 22:18:31 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 22:18:31 +0000 |
| commit | a93c123b0aa83fead7ec52247c5c14af1437ac02 (patch) | |
| tree | d698f5aefd30b4491c4bbaa0ea927c2a115579a4 /remoting/tools | |
| parent | e5196921b28048355added203fc1f6cb3dd8b435 (diff) | |
| download | chromium_src-a93c123b0aa83fead7ec52247c5c14af1437ac02.zip chromium_src-a93c123b0aa83fead7ec52247c5c14af1437ac02.tar.gz chromium_src-a93c123b0aa83fead7ec52247c5c14af1437ac02.tar.bz2 | |
Fix me2me_virtual_host.py to handle blocked user accounts properly.
Previously the host daemon wasn't handling correctly error codes 103 and 105. This was a caused by merge conflict between crrev.com/10830225
and crrev.com/10823083.
Review URL: https://codereview.chromium.org/11535010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172430 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
| -rwxr-xr-x | remoting/tools/me2me_virtual_host.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index dcb8efd..57688f2 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -1027,12 +1027,16 @@ Web Store: https://chrome.google.com/remotedesktop""" return 0 elif os.WEXITSTATUS(status) == 103: logging.info("Host domain is blocked by policy - exiting.") - os.remove(host.config_file) + host_config.clear_auth() + host_config.clear_host_info() + host_config.save() return 0 # Nothing to do for Mac-only status 104 (login screen unsupported) elif os.WEXITSTATUS(status) == 105: logging.info("Username is blocked by policy - exiting.") - os.remove(host.config_file) + host_config.clear_auth() + host_config.clear_host_info() + host_config.save() return 0 |