Revert "Enable positional parameters for base::vsnprintf and base::vswprintf on Windows."

remoting/host/win/unprivileged_process_delegate.cc

 
 // Copyright (c) 2012 The Chromium 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 file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/win/unprivileged_process_delegate.h"
 
@@ skipping 40 matching lines @@
 const char kDesktopSdFormat[] = "O:SYG:SYD:(A;;0xf01ff;;;SY)(A;;0xf01ff;;;%s)";
 
 // Mandatory label specifying low integrity level.
 const char kLowIntegrityMandatoryLabel[] = "S:(ML;CIOI;NW;;;LW)";
 
 // Security descriptor of the window station the worker process attaches to. It
 // gives SYSTEM and the logon SID full access the window station. The child
 // containers and objects inherit ACE giving SYSTEM and the logon SID full
 // access to them as well.
 const char kWindowStationSdFormat[] = "O:SYG:SYD:(A;CIOIIO;GA;;;SY)"
-    "(A;CIOIIO;GA;;;%1$s)(A;NP;0xf037f;;;SY)(A;NP;0xf037f;;;%1$s)";
+    "(A;CIOIIO;GA;;;%s)(A;NP;0xf037f;;;SY)(A;NP;0xf037f;;;%s)";
 
 // Security descriptor of the worker process. It gives access SYSTEM full access
 // to the process. It gives READ_CONTROL, SYNCHRONIZE, PROCESS_QUERY_INFORMATION
 // and PROCESS_TERMINATE rights to the built-in administrators group.
 const char kWorkerProcessSd[] = "O:SYG:SYD:(A;;GA;;;SY)(A;;0x120401;;;BA)";
 
 // Security descriptor of the worker process threads. It gives access SYSTEM
 // full access to the threads. It gives READ_CONTROL, SYNCHRONIZE,
 // THREAD_QUERY_INFORMATION and THREAD_TERMINATE rights to the built-in
 // administrators group.
@@ skipping 44 matching lines @@
   std::string logon_sid_string = ConvertSidToString(logon_sid.get());
   if (logon_sid_string.empty()) {
     PLOG(ERROR) << "Failed to convert a SID to string";
     return false;
   }
 
   // Format the security descriptors in SDDL form.
   std::string desktop_sddl =
       base::StringPrintf(kDesktopSdFormat, logon_sid_string.c_str());
   std::string window_station_sddl =
-      base::StringPrintf(kWindowStationSdFormat, logon_sid_string.c_str());
+      base::StringPrintf(kWindowStationSdFormat, logon_sid_string.c_str(),
+                         logon_sid_string.c_str());
 
   // The worker runs at low integrity level. Make sure it will be able to attach
   // to the window station and desktop.
   if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     desktop_sddl += kLowIntegrityMandatoryLabel;
     window_station_sddl += kLowIntegrityMandatoryLabel;
   }
 
   // Create the desktop and window station security descriptors.
   ScopedSd desktop_sd = ConvertSddlToSd(desktop_sddl);
@@ skipping 275 matching lines @@
     PLOG(ERROR) << "Failed to duplicate a handle";
     ReportFatalError();
     return;
   }
   ScopedHandle limited_handle(temp_handle);
 
   event_handler_->OnProcessLaunched(limited_handle.Pass());
 }
 
 }  // namespace remoting