Revert "Add support for removing and adding --dom-login from arguments"

child_job.cc

 // Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This class is most definitely NOT re-entrant.
 
 #include "login_manager/child_job.h"
 
 #include <errno.h>
 #include <glib.h>
@@ skipping 21 matching lines @@
 const int ChildJobInterface::kCantSetGid = 128;
 const int ChildJobInterface::kCantSetGroups = 129;
 const int ChildJobInterface::kCantExec = 255;
 const int ChildJobInterface::kBWSI = 1;
 
 // static
 const char ChildJob::kLoginManagerFlag[] = "--login-manager";
 // static
 const char ChildJob::kLoginUserFlag[] = "--login-user=";
 // static
-const char ChildJob::kDOMLoginFlag[] = "--dom-login";
-// static
 const char ChildJob::kBWSIFlag[] = "--bwsi";
 // static
 const char ChildJob::kWindowManagerSuffix[] = "window-manager-session.sh";
 
 // static
 const int ChildJob::kRestartWindow = 1;
 
 ChildJob::ChildJob(const std::vector<std::string>& arguments)
       : arguments_(arguments),
         desired_uid_(0),
@@ skipping 46 matching lines @@
 void ChildJob::StartSession(const std::string& email) {
   std::vector<std::string>::iterator to_erase =
       std::remove(arguments_.begin(),
                   arguments_.end(),
                   kLoginManagerFlag);
   if (to_erase != arguments_.end()) {
     arguments_.erase(to_erase, arguments_.end());
     removed_login_manager_flag_ = true;
   }
 
-  to_erase = std::remove(arguments_.begin(),
-                         arguments_.end(),
-                         kDOMLoginFlag);
-  if (to_erase != arguments_.end()) {
-    arguments_.erase(to_erase, arguments_.end());
-    removed_dom_login_flag_ = true;
-  }
-
   arguments_.push_back(kLoginUserFlag);
   arguments_.back().append(email);
 }
 
 void ChildJob::StopSession() {
   // The last element for started session is always login user flag.
   arguments_.pop_back();
   if (removed_login_manager_flag_) {
     arguments_.push_back(kLoginManagerFlag);
     removed_login_manager_flag_ = false;
   }
-
-  if (removed_dom_login_flag_) {
-    arguments_.push_back(kDOMLoginFlag);
-    removed_dom_login_flag_ = false;
-  }
-
 }
 
 uid_t ChildJob::GetDesiredUid() const {
   DCHECK(IsDesiredUidSet());
   return desired_uid_;
 }
 
 void ChildJob::SetDesiredUid(uid_t uid) {
   is_desired_uid_set_ = true;
   desired_uid_ = uid;
@@ skipping 74 matching lines @@
       to_return = kCantSetGid;
     if (setuid(desired_uid_) == -1)
       to_return = kCantSetUid;
   }
   if (setsid() == -1)
     LOG(ERROR) << "can't setsid: " << strerror(errno);
   return to_return;
 }
 
 }  // namespace login_manager