Allow the seccomp sandbox to be enabled, even if the suid sandbox has...

sandbox/linux/seccomp/ipc.cc

Index: sandbox/linux/seccomp/ipc.cc
===================================================================
--- sandbox/linux/seccomp/ipc.cc	(revision 31339)
+++ sandbox/linux/seccomp/ipc.cc	(working copy)
@@ -108,7 +108,7 @@
   return static_cast<int>(rc);
 }
 
-bool Sandbox::process_shmat(int parentProc, int sandboxFd, int threadFdPub,
+bool Sandbox::process_shmat(int parentMapsFd, int sandboxFd, int threadFdPub,
                             int threadFd, SecureMem::Args* mem) {
   // Read request
   ShmAt shmat_req;
@@ -133,7 +133,7 @@
   return true;
 }
 
-bool Sandbox::process_shmctl(int parentProc, int sandboxFd, int threadFdPub,
+bool Sandbox::process_shmctl(int parentMapsFd, int sandboxFd, int threadFdPub,
                              int threadFd, SecureMem::Args* mem) {
   // Read request
   ShmCtl shmctl_req;
@@ -158,7 +158,7 @@
   return true;
 }
 
-bool Sandbox::process_shmdt(int parentProc, int sandboxFd, int threadFdPub,
+bool Sandbox::process_shmdt(int parentMapsFd, int sandboxFd, int threadFdPub,
                             int threadFd, SecureMem::Args* mem) {
   // Read request
   ShmDt shmdt_req;
@@ -193,7 +193,7 @@
   return true;
 }
 
-bool Sandbox::process_shmget(int parentProc, int sandboxFd, int threadFdPub,
+bool Sandbox::process_shmget(int parentMapsFd, int sandboxFd, int threadFdPub,
                              int threadFd, SecureMem::Args* mem) {
   // Read request
   ShmGet shmget_req;
@@ -261,7 +261,7 @@
   return static_cast<int>(rc);
 }
 
-bool Sandbox::process_ipc(int parentProc, int sandboxFd, int threadFdPub,
+bool Sandbox::process_ipc(int parentMapsFd, int sandboxFd, int threadFdPub,
                           int threadFd, SecureMem::Args* mem) {
   // Read request
   IPC ipc_req;
Property changes on: sandbox/linux/seccomp/ipc.cc
___________________________________________________________________
Added: svn:eol-style
   + LF