diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-03 01:24:31 +0200 |
| commit | 4613b91ecac2745252c40be64e73de5ff920b02b (patch) | |
| tree | 26b0aa50bb4d580b156ab2eb9825707a17f51e99 /js/xpconnect | |
| parent | e1490c07e29f5e4715f73088b7ca7aab4ada90a6 (diff) | |
| download | UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.gz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.lz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.tar.xz UXP-4613b91ecac2745252c40be64e73de5ff920b02b.zip | |
Remove sandbox ductwork conditional code.
Diffstat (limited to 'js/xpconnect')
| -rw-r--r-- | js/xpconnect/shell/moz.build | 16 | ||||
| -rw-r--r-- | js/xpconnect/shell/xpcshell.cpp | 7 | ||||
| -rw-r--r-- | js/xpconnect/src/XPCShellImpl.cpp | 13 |
3 files changed, 0 insertions, 36 deletions
diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build index ecc796f7f..d4f5d55af 100644 --- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -35,22 +35,6 @@ if CONFIG['_MSC_VER']: if CONFIG['OS_ARCH'] == 'WINNT': RCINCLUDE = 'xpcshell.rc' - if CONFIG['MOZ_SANDBOX']: - # For sandbox includes and the include dependencies those have - LOCAL_INCLUDES += [ - '/security/sandbox/chromium', - '/security/sandbox/chromium-shim', - ] - - USE_LIBS += [ - 'sandbox_s', - ] - - DELAYLOAD_DLLS += [ - 'winmm.dll', - 'user32.dll', - ] - DELAYLOAD_DLLS += [ 'xul.dll', ] diff --git a/js/xpconnect/shell/xpcshell.cpp b/js/xpconnect/shell/xpcshell.cpp index ba979bc69..4521dc52f 100644 --- a/js/xpconnect/shell/xpcshell.cpp +++ b/js/xpconnect/shell/xpcshell.cpp @@ -22,9 +22,6 @@ #define XRE_DONT_PROTECT_DLL_LOAD #define XRE_WANT_ENVIRON #include "nsWindowsWMain.cpp" -#ifdef MOZ_SANDBOX -#include "mozilla/sandboxing/SandboxInitialization.h" -#endif #endif #ifdef MOZ_WIDGET_GTK @@ -54,10 +51,6 @@ main(int argc, char** argv, char** envp) #endif XREShellData shellData; -#if defined(XP_WIN) && defined(MOZ_SANDBOX) - shellData.sandboxBrokerServices = - mozilla::sandboxing::GetInitializedBrokerServices(); -#endif int result = XRE_XPCShellMain(argc, argv, envp, &shellData); diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp index 45d00d390..f6c74f9b2 100644 --- a/js/xpconnect/src/XPCShellImpl.cpp +++ b/js/xpconnect/src/XPCShellImpl.cpp @@ -44,9 +44,6 @@ #ifdef XP_WIN #include "mozilla/widget/AudioSession.h" #include <windows.h> -#if defined(MOZ_SANDBOX) -#include "SandboxBroker.h" -#endif #endif // all this crap is needed to do the interactive shell stuff @@ -1484,16 +1481,6 @@ XRE_XPCShellMain(int argc, char** argv, char** envp, // Plugin may require audio session if installed plugin can initialize // asynchronized. AutoAudioSession audioSession; - -#if defined(MOZ_SANDBOX) - // Required for sandboxed child processes. - if (aShellData->sandboxBrokerServices) { - SandboxBroker::Initialize(aShellData->sandboxBrokerServices); - } else { - NS_WARNING("Failed to initialize broker services, sandboxed " - "processes will fail to start."); - } -#endif #endif { |