Revision: 23883 http://trac.macosforge.org/projects/launchd/changeset/23883 Author: dsorresso@apple.com Date: 2009-04-07 15:37:42 -0700 (Tue, 07 Apr 2009) Log Message: ----------- <rdar://problem/6763804> job_mig_lookup_per_user_context needs its own operation for sandbox_check Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd.xcodeproj/project.pbxproj Added Paths: ----------- trunk/launchd/src/launchd.ops Added: trunk/launchd/src/launchd.ops =================================================================== --- trunk/launchd/src/launchd.ops (rev 0) +++ trunk/launchd/src/launchd.ops 2009-04-07 22:37:42 UTC (rev 23883) @@ -0,0 +1,2 @@ +< mach* > + mach-per-user-lookup Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-03 22:37:44 UTC (rev 23882) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-07 22:37:42 UTC (rev 23883) @@ -7400,7 +7400,7 @@ #endif #if HAVE_SANDBOX - if (unlikely(sandbox_check(ldc->pid, "job-creation", SANDBOX_FILTER_NONE) > 0)) { + if (unlikely(sandbox_check(ldc->pid, "mach-per-user-lookup", SANDBOX_FILTER_NONE) > 0)) { return BOOTSTRAP_NOT_PRIVILEGED; } #endif Modified: trunk/launchd.xcodeproj/project.pbxproj =================================================================== --- trunk/launchd.xcodeproj/project.pbxproj 2009-04-03 22:37:44 UTC (rev 23882) +++ trunk/launchd.xcodeproj/project.pbxproj 2009-04-07 22:37:42 UTC (rev 23883) @@ -73,6 +73,7 @@ 4B10F1EB0F43BF5C00875782 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC3628070E9345E10054F1A3 /* CoreFoundation.framework */; }; 4B10F1EC0F43BF5C00875782 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FCD713730E95DE49001B0111 /* libedit.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 4B10F1EF0F43BF5C00875782 /* launchctl.1 in CopyFiles */ = {isa = PBXBuildFile; fileRef = FC59A0AD0E8C8A0E00D41150 /* launchctl.1 */; }; + 4B1D92010F8BDE7D00125940 /* launchd.ops in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4B1D91ED0F8BDE1A00125940 /* launchd.ops */; }; 4B9EDCA20EAFC77E00A78496 /* DiskArbitration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4B9EDCA10EAFC77E00A78496 /* DiskArbitration.framework */; }; 7215DE4C0EFAF2EC00ABD81E /* libauditd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7215DE4B0EFAF2EC00ABD81E /* libauditd.dylib */; }; 721FBEBC0EA7AE2F0057462B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721FBEBB0EA7AE2F0057462B /* Security.framework */; }; @@ -247,6 +248,16 @@ ); runOnlyForDeploymentPostprocessing = 1; }; + 4B1D91F40F8BDE6800125940 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 8; + dstPath = usr/local/share/sandbox/operations/; + dstSubfolderSpec = 0; + files = ( + 4B1D92010F8BDE7D00125940 /* launchd.ops in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 1; + }; FC3627D60E9343B90054F1A3 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 8; @@ -356,6 +367,7 @@ /* Begin PBXFileReference section */ 4B10F1D30F43BE7E00875782 /* launchd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = launchd; sourceTree = BUILT_PRODUCTS_DIR; }; 4B10F1F30F43BF5C00875782 /* launchctl */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = launchctl; sourceTree = BUILT_PRODUCTS_DIR; }; + 4B1D91ED0F8BDE1A00125940 /* launchd.ops */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = launchd.ops; path = launchd/src/launchd.ops; sourceTree = "<group>"; }; 4B9EDCA10EAFC77E00A78496 /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = /System/Library/Frameworks/DiskArbitration.framework; sourceTree = "<absolute>"; }; 7215DE4B0EFAF2EC00ABD81E /* libauditd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libauditd.dylib; path = /usr/lib/libauditd.dylib; sourceTree = "<absolute>"; }; 721FBEA50EA7ABC40057462B /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = launchd/src/config.h; sourceTree = "<group>"; }; @@ -649,6 +661,7 @@ FC59A0E10E8C8A9400D41150 /* liblaunch */ = { isa = PBXGroup; children = ( + 4B1D91ED0F8BDE1A00125940 /* launchd.ops */, FC59A0FB0E8C8ACE00D41150 /* reboot2.h */, FC59A0E20E8C8AA600D41150 /* vproc.h */, FC59A0E30E8C8AA600D41150 /* vproc_priv.h */, @@ -758,6 +771,7 @@ isa = PBXNativeTarget; buildConfigurationList = FC59A0650E8C886700D41150 /* Build configuration list for PBXNativeTarget "liblaunch" */; buildPhases = ( + 4B1D91F40F8BDE6800125940 /* CopyFiles */, FC59A05C0E8C885100D41150 /* Headers */, FC59A05D0E8C885100D41150 /* Sources */, FC59A05E0E8C885100D41150 /* Frameworks */,