@@ -154,11 +154,11 @@ @implementation OFApplication @synthesize programName = _programName, arguments = _arguments; @synthesize environment = _environment; #ifdef OF_HAVE_SANDBOX @synthesize activeSandbox = _activeSandbox; -@synthesize activeExecSandbox = _activeExecSandbox; +@synthesize activeSandboxForChildProcesses = _activeSandboxForChildProcesses; #endif + (OFApplication *)sharedApplication { return app; @@ -203,13 +203,13 @@ + (void)activateSandbox: (OFSandbox *)sandbox { [app activateSandbox: sandbox]; } -+ (void)activateSandboxForExecdProcesses: (OFSandbox *)sandbox ++ (void)activateSandboxForChildProcesses: (OFSandbox *)sandbox { - [app activateSandboxForExecdProcesses: sandbox]; + [app activateSandboxForChildProcesses: sandbox]; } #endif - (instancetype)init { @@ -628,17 +628,18 @@ if (_activeSandbox == nil) _activeSandbox = [sandbox retain]; # endif } -- (void)activateSandboxForExecdProcesses: (OFSandbox *)sandbox +- (void)activateSandboxForChildProcesses: (OFSandbox *)sandbox { # ifdef OF_HAVE_PLEDGE void *pool = objc_autoreleasePoolPush(); const char *promises; - if (_activeExecSandbox != nil && sandbox != _activeExecSandbox) + if (_activeSandboxForChildProcesses != nil && + sandbox != _activeSandboxForChildProcesses) @throw [OFInvalidArgumentException exception]; if (sandbox.unveiledPaths.count != 0) @throw [OFInvalidArgumentException exception]; @@ -650,11 +651,11 @@ exceptionWithSandbox: sandbox errNo: errno]; objc_autoreleasePoolPop(pool); - if (_activeExecSandbox == nil) - _activeExecSandbox = [sandbox retain]; + if (_activeSandboxForChildProcesses == nil) + _activeSandboxForChildProcesses = [sandbox retain]; # endif } #endif @end