Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(798)

Unified Diff: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc

Issue 10443125: Allow re-enrollment to the same domain in case of policy data loss. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
index 9b50a20e91b7d3116d887f8492885520c8913f6e..0992f6e53853ed83c313097d1cfd7fed05d57f37 100644
--- a/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.cc
@@ -228,12 +228,19 @@ void EnterpriseEnrollmentScreen::RegisterForDevicePolicy(
g_browser_process->browser_policy_connector();
if (!connector->device_cloud_policy_subsystem()) {
LOG(ERROR) << "Cloud policy subsystem not initialized.";
- } else if (connector->IsEnterpriseManaged()) {
- LOG(ERROR) << "Device is already enterprise managed!";
} else if (connector->device_cloud_policy_subsystem()->state() ==
policy::CloudPolicySubsystem::SUCCESS) {
LOG(ERROR) << "A previous enrollment already succeeded!";
} else {
+ if (connector->IsEnterpriseManaged() &&
+ connector->GetEnterpriseDomain() !=
+ chromeos::Authenticator::ExtractDomainName(user_)) {
+ LOG(ERROR) << "Trying to re-enroll to a different domain than "
+ << connector->GetEnterpriseDomain();
+ if (is_showing_)
+ actor_->ShowDomainMismatchError();
+ return;
+ }
// Make sure the device policy subsystem is in a clean slate.
connector->ResetDevicePolicy();
connector->ScheduleServiceInitialization(0);

Powered by Google App Engine
This is Rietveld 408576698