Setuid sandbox API versioning

content/browser/zygote_host_impl_linux.cc

Index: content/browser/zygote_host_impl_linux.cc
diff --git a/content/browser/zygote_host_impl_linux.cc b/content/browser/zygote_host_impl_linux.cc
index 10214ec4e940c2b39696db68c011d8a83abcf37f..6d73a2e2033b1fd92c588dfb208673c04e85480e 100644
--- a/content/browser/zygote_host_impl_linux.cc
+++ b/content/browser/zygote_host_impl_linux.cc
@@ -38,6 +38,14 @@
 #include "third_party/tcmalloc/chromium/src/gperftools/heap-profiler.h"
 #endif
 
+// Set an environment variable that reflects the API version we expect from the
+// setuid sandbox. Old versions of the sandbox will ignore this.
+static void SetSandboxAPIEnvironmentVariable() {
+   scoped_ptr<base::Environment> env(base::Environment::Create());

[brettw, 2012/06/04 23:21:59]

You got 3 space indents here. Undent one.

+   env->SetVar(base::kSandboxEnvironmentApiRequest,
+               base::IntToString(base::kSUIDSandboxApiNumber));
+}
+
 static void SaveSUIDUnsafeEnvironmentVariables() {
   // The ELF loader will clear many environment variables so we save them to
   // different names here so that the SUID sandbox can resolve them for the
@@ -146,6 +154,7 @@ void ZygoteHostImpl::Init(const std::string& sandbox_cmd) {
       cmd_line.PrependWrapper(sandbox_binary_);
 
       SaveSUIDUnsafeEnvironmentVariables();
+      SetSandboxAPIEnvironmentVariable();
     } else {
       LOG(FATAL) << "The SUID sandbox helper binary was found, but is not "
                     "configured correctly. Rather than run without sandboxing "