From source_changes at macosforge.org Mon Nov 16 17:28:42 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Mon, 16 Nov 2009 17:28:42 -0800 (PST) Subject: [launchd-changes] [23945] branches/PR-7386864/ Message-ID: <20091117012842.CB129333F2C3@beta.macosforge.org> Revision: 23945 http://trac.macosforge.org/projects/launchd/changeset/23945 Author: dsorresso at apple.com Date: 2009-11-16 17:28:39 -0800 (Mon, 16 Nov 2009) Log Message: ----------- "Branch for PR-7386864 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-7386864/ Property changes on: branches/PR-7386864 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7178164:23935-23940 -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Mon Nov 16 18:07:25 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Mon, 16 Nov 2009 18:07:25 -0800 (PST) Subject: [launchd-changes] [23946] branches/PR-7386864/launchd/src/launchd_core_logic.c Message-ID: <20091117020725.942333342746@beta.macosforge.org> Revision: 23946 http://trac.macosforge.org/projects/launchd/changeset/23946 Author: dsorresso at apple.com Date: 2009-11-16 18:07:24 -0800 (Mon, 16 Nov 2009) Log Message: ----------- Fix for rdar://problem/7386864. Modified Paths: -------------- branches/PR-7386864/launchd/src/launchd_core_logic.c Modified: branches/PR-7386864/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7386864/launchd/src/launchd_core_logic.c 2009-11-17 01:28:39 UTC (rev 23945) +++ branches/PR-7386864/launchd/src/launchd_core_logic.c 2009-11-17 02:07:24 UTC (rev 23946) @@ -7673,10 +7673,10 @@ *serviceportp = machservice_port(ms); kr = BOOTSTRAP_SUCCESS; - } else if (!per_pid_lookup && (inherited_bootstrap_port != MACH_PORT_NULL)) { + } else if (inherited_bootstrap_port != MACH_PORT_NULL) { job_log(j, LOG_DEBUG, "Mach service lookup forwarded: %s", servicename); /* Clients potentially check the audit token of the reply to verify that the returned send right is trustworthy. */ - job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, 0, 0) == 0); + job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, target_pid, flags) == 0); /* The previous routine moved the reply port, we're forced to return MIG_NO_REPLY now */ return MIG_NO_REPLY; } else if (pid1_magic && j->anonymous && ldc->euid >= 500 && strcasecmp(j->mgr->name, VPROCMGR_SESSION_LOGINWINDOW) == 0) { -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 15:25:44 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 15:25:44 -0800 (PST) Subject: [launchd-changes] [23947] branches/PR-7264615/ Message-ID: <20091117232545.54DC0338B3E0@beta.macosforge.org> Revision: 23947 http://trac.macosforge.org/projects/launchd/changeset/23947 Author: dsorresso at apple.com Date: 2009-11-17 15:25:41 -0800 (Tue, 17 Nov 2009) Log Message: ----------- "Branch for PR-7264615 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-7264615/ Property changes on: branches/PR-7264615 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7178164:23935-23940 -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 16:01:47 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 16:01:47 -0800 (PST) Subject: [launchd-changes] [23948] branches/PR-7264615/launchd/src/launchd_core_logic.c Message-ID: <20091118000147.8F1FB338BBCF@beta.macosforge.org> Revision: 23948 http://trac.macosforge.org/projects/launchd/changeset/23948 Author: dsorresso at apple.com Date: 2009-11-17 16:01:44 -0800 (Tue, 17 Nov 2009) Log Message: ----------- "Fix" for rdar://problem/7264615. Modified Paths: -------------- branches/PR-7264615/launchd/src/launchd_core_logic.c Modified: branches/PR-7264615/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-17 23:25:41 UTC (rev 23947) +++ branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:01:44 UTC (rev 23948) @@ -1417,7 +1417,17 @@ kp_euid, kp_uid, kp_svuid, kp_egid, kp_gid, kp_svgid, anonpid, kp.kp_proc.p_comm); } - switch (kp.kp_eproc.e_ppid) { + /* "Fix" for a problem that shouldn't even exist. + * See rdar://problem/7264615 for the symptom and rdar://problem/5020256 + * as to why this can happen. + */ + pid_t ppid = kp.kp_eproc.e_ppid; + if( !jobmgr_assumes(jm, ppid != anonpid) ) { + jobmgr_log(jm, LOG_WARNING, "Process has become its own parent through ptrace(3). It should find a different way to do whatever it's doing. Setting PPID to 0: %s", kp.kp_proc.p_comm); + ppid = 0; + } + + switch (ppid) { case 0: /* the kernel */ break; @@ -3249,7 +3259,15 @@ * * Otherwise, we wait for the death of the parent tracer and then reap, just as we * would if a job died while we were sampling it at shutdown. + * + * Note that we foolishly assume that in the process *tree* a node cannot be its + * own parent. Apparently, that is not correct. If this is the case, we forsake + * the process to its own device. Let it reap itself. */ + if( !job_assumes(j, kp.kp_eproc.e_ppid != (pid_t)kev->ident) ) { + job_log(j, LOG_WARNING, "Job is its own parent and has (somehow) exited. Leaving it to waste away."); + return; + } if( job_assumes(j, kevent_mod(kp.kp_eproc.e_ppid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, j) != -1) ) { j->tracing_pid = kp.kp_eproc.e_ppid; j->reap_after_trace = true; @@ -7325,6 +7343,12 @@ return 1; } + if( !job_assumes(j, pid_to_log == kp.kp_eproc.e_ppid) ) { + job_log(j, LOG_WARNING, "Job which is its own parent started reboot."); + snprintf(who_started_the_reboot, sizeof(who_started_the_reboot), "%s[%u]->%s[%u]->%s[%u]->...", kp.kp_proc.p_comm, pid_to_log, kp.kp_proc.p_comm, pid_to_log, kp.kp_proc.p_comm, pid_to_log); + break; + } + who_offset = strlen(who_started_the_reboot); snprintf(who_started_the_reboot + who_offset, sizeof(who_started_the_reboot) - who_offset, " %s[%u]%s", kp.kp_proc.p_comm, pid_to_log, kp.kp_eproc.e_ppid ? " ->" : ""); -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 16:10:12 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 16:10:12 -0800 (PST) Subject: [launchd-changes] [23949] branches/PR-7264615/launchd/src/launchd_core_logic.c Message-ID: <20091118001012.97183338BD94@beta.macosforge.org> Revision: 23949 http://trac.macosforge.org/projects/launchd/changeset/23949 Author: dsorresso at apple.com Date: 2009-11-17 16:10:09 -0800 (Tue, 17 Nov 2009) Log Message: ----------- Whoops. Modified Paths: -------------- branches/PR-7264615/launchd/src/launchd_core_logic.c Modified: branches/PR-7264615/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:01:44 UTC (rev 23948) +++ branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:10:09 UTC (rev 23949) @@ -3262,7 +3262,7 @@ * * Note that we foolishly assume that in the process *tree* a node cannot be its * own parent. Apparently, that is not correct. If this is the case, we forsake - * the process to its own device. Let it reap itself. + * the process to its own devices. Let it reap itself. */ if( !job_assumes(j, kp.kp_eproc.e_ppid != (pid_t)kev->ident) ) { job_log(j, LOG_WARNING, "Job is its own parent and has (somehow) exited. Leaving it to waste away."); @@ -7343,7 +7343,7 @@ return 1; } - if( !job_assumes(j, pid_to_log == kp.kp_eproc.e_ppid) ) { + if( !job_assumes(j, pid_to_log != kp.kp_eproc.e_ppid) ) { job_log(j, LOG_WARNING, "Job which is its own parent started reboot."); snprintf(who_started_the_reboot, sizeof(who_started_the_reboot), "%s[%u]->%s[%u]->%s[%u]->...", kp.kp_proc.p_comm, pid_to_log, kp.kp_proc.p_comm, pid_to_log, kp.kp_proc.p_comm, pid_to_log); break; -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 16:24:46 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 16:24:46 -0800 (PST) Subject: [launchd-changes] [23950] branches/PR-7264615/launchd/src/launchd_core_logic.c Message-ID: <20091118002446.A0ACD338C27E@beta.macosforge.org> Revision: 23950 http://trac.macosforge.org/projects/launchd/changeset/23950 Author: dsorresso at apple.com Date: 2009-11-17 16:24:45 -0800 (Tue, 17 Nov 2009) Log Message: ----------- Another attempt. Modified Paths: -------------- branches/PR-7264615/launchd/src/launchd_core_logic.c Modified: branches/PR-7264615/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:10:09 UTC (rev 23949) +++ branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:24:45 UTC (rev 23950) @@ -1421,13 +1421,13 @@ * See rdar://problem/7264615 for the symptom and rdar://problem/5020256 * as to why this can happen. */ - pid_t ppid = kp.kp_eproc.e_ppid; - if( !jobmgr_assumes(jm, ppid != anonpid) ) { + if( !jobmgr_assumes(jm, kp.kp_eproc.e_ppid != anonpid) ) { jobmgr_log(jm, LOG_WARNING, "Process has become its own parent through ptrace(3). It should find a different way to do whatever it's doing. Setting PPID to 0: %s", kp.kp_proc.p_comm); - ppid = 0; + errno = EINVAL; + return NULL; } - switch (ppid) { + switch (kp.kp_eproc.e_ppid) { case 0: /* the kernel */ break; -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 16:45:29 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 16:45:29 -0800 (PST) Subject: [launchd-changes] [23951] branches/PR-7264615/launchd/src/launchd_core_logic.c Message-ID: <20091118004530.2E287338CA3B@beta.macosforge.org> Revision: 23951 http://trac.macosforge.org/projects/launchd/changeset/23951 Author: dsorresso at apple.com Date: 2009-11-17 16:45:29 -0800 (Tue, 17 Nov 2009) Log Message: ----------- Yet again. Modified Paths: -------------- branches/PR-7264615/launchd/src/launchd_core_logic.c Modified: branches/PR-7264615/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:24:45 UTC (rev 23950) +++ branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:45:29 UTC (rev 23951) @@ -1427,28 +1427,11 @@ return NULL; } - switch (kp.kp_eproc.e_ppid) { - case 0: - /* the kernel */ - break; - case 1: - if (!pid1_magic) { - /* we cannot possibly find a parent job_t that is useful in this function */ - break; - } - /* fall through */ - default: - jp = jobmgr_find_by_pid(jm, kp.kp_eproc.e_ppid, true); - jobmgr_assumes(jm, jp != NULL); - break; - } - if (jp && !jp->anonymous && unlikely(!(kp.kp_proc.p_flag & P_EXEC))) { job_log(jp, LOG_DEBUG, "Called *fork(). Please switch to posix_spawn*(), pthreads or launchd. Child PID %u", kp.kp_proc.p_pid); } - /* A total hack: Normally, job_new() returns an error during shutdown, but anonymous jobs are special. */ if (unlikely(shutdown_state = jm->shutting_down)) { jm->shutting_down = false; @@ -1481,6 +1464,25 @@ jm->shutting_down = true; } + /* This is down here to mitigate the effects of rdar://problem/7264615, in which a process + * attaches to its own parent. + */ + switch (kp.kp_eproc.e_ppid) { + case 0: + /* the kernel */ + break; + case 1: + if (!pid1_magic) { + /* we cannot possibly find a parent job_t that is useful in this function */ + break; + } + /* fall through */ + default: + jp = jobmgr_find_by_pid(jm, kp.kp_eproc.e_ppid, true); + jobmgr_assumes(jm, jp != NULL); + break; + } + return jr; } -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 16:51:59 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 16:51:59 -0800 (PST) Subject: [launchd-changes] [23952] branches/PR-7264615/launchd/src/launchd_core_logic.c Message-ID: <20091118005159.F06F2338CB7A@beta.macosforge.org> Revision: 23952 http://trac.macosforge.org/projects/launchd/changeset/23952 Author: dsorresso at apple.com Date: 2009-11-17 16:51:59 -0800 (Tue, 17 Nov 2009) Log Message: ----------- Updated comment. Modified Paths: -------------- branches/PR-7264615/launchd/src/launchd_core_logic.c Modified: branches/PR-7264615/launchd/src/launchd_core_logic.c =================================================================== --- branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:45:29 UTC (rev 23951) +++ branches/PR-7264615/launchd/src/launchd_core_logic.c 2009-11-18 00:51:59 UTC (rev 23952) @@ -1465,7 +1465,10 @@ } /* This is down here to mitigate the effects of rdar://problem/7264615, in which a process - * attaches to its own parent. + * attaches to its own parent. We need to make sure that the anonymous job has been added + * to the process list so that, if it's used ptrace(3) to cause a cycle in the process + * tree (thereby making it not a tree anymore), we'll find the tracing parent PID of the + * parent process, which is the child, when we go looking for it in jobmgr_find_by_pid(). */ switch (kp.kp_eproc.e_ppid) { case 0: -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 17:00:03 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 17:00:03 -0800 (PST) Subject: [launchd-changes] [23953] branches/PR-7242460/ Message-ID: <20091118010003.53E39338CCE5@beta.macosforge.org> Revision: 23953 http://trac.macosforge.org/projects/launchd/changeset/23953 Author: dsorresso at apple.com Date: 2009-11-17 17:00:02 -0800 (Tue, 17 Nov 2009) Log Message: ----------- "Branch for PR-7242460 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- branches/PR-7242460/ Property changes on: branches/PR-7242460 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7178164:23935-23940 -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 17:07:20 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 17:07:20 -0800 (PST) Subject: [launchd-changes] [23954] branches/PR-7242460/launchd/src/launchd_runtime.c Message-ID: <20091118010721.17C4D338CE65@beta.macosforge.org> Revision: 23954 http://trac.macosforge.org/projects/launchd/changeset/23954 Author: dsorresso at apple.com Date: 2009-11-17 17:07:18 -0800 (Tue, 17 Nov 2009) Log Message: ----------- Fix for rdar://problem/7242460. Modified Paths: -------------- branches/PR-7242460/launchd/src/launchd_runtime.c Modified: branches/PR-7242460/launchd/src/launchd_runtime.c =================================================================== --- branches/PR-7242460/launchd/src/launchd_runtime.c 2009-11-18 01:00:02 UTC (rev 23953) +++ branches/PR-7242460/launchd/src/launchd_runtime.c 2009-11-18 01:07:18 UTC (rev 23954) @@ -538,11 +538,11 @@ #if 0 if (launchd_assumes(kev.udata != NULL)) { #endif - log_kevent_struct(LOG_DEBUG, &kev, i); + log_kevent_struct(LOG_DEBUG, &kev, 0); (*((kq_callback *)kev.udata))(kev.udata, &kev); #if 0 } else { - log_kevent_struct(LOG_ERR, &kev, i); + log_kevent_struct(LOG_ERR, &kev, 0); } #endif /* the callback may have tainted our ability to continue this for loop */ @@ -590,7 +590,7 @@ if (launchd_assumes((bulk_kev_cnt = kevent(fd, NULL, 0, kev, BULK_KEV_MAX, &ts)) != -1)) { #if 0 for (i = 0; i < bulk_kev_cnt; i++) { - log_kevent_struct(LOG_DEBUG, kev, i); + log_kevent_struct(LOG_DEBUG, kev, 0); } #endif for (i = 0; i < bulk_kev_cnt; i++) { @@ -611,7 +611,7 @@ runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END); } else { runtime_syslog(LOG_ERR, "The following kevent had invalid context data."); - log_kevent_struct(LOG_EMERG, kevi, i); + log_kevent_struct(LOG_EMERG, kev, i); } #else runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kevi->ident, kevi->filter, kevi->fflags); @@ -863,7 +863,7 @@ for( i = bulk_kev_i + 1; i < bulk_kev_cnt; i++ ) { if( bulk_kev[i].filter == filter && bulk_kev[i].ident == ident ) { runtime_syslog(LOG_DEBUG, "Pruning the following kevent:"); - log_kevent_struct(LOG_DEBUG, &bulk_kev[i], i); + log_kevent_struct(LOG_DEBUG, bulk_kev, i); bulk_kev[i].filter = (short)0; } } -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 17:18:55 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 17:18:55 -0800 (PST) Subject: [launchd-changes] [23955] branches/PR-7242460/launchd/src/launchd_runtime.c Message-ID: <20091118011855.C5E1D338D0B5@beta.macosforge.org> Revision: 23955 http://trac.macosforge.org/projects/launchd/changeset/23955 Author: dsorresso at apple.com Date: 2009-11-17 17:18:55 -0800 (Tue, 17 Nov 2009) Log Message: ----------- Minor adjustments. Modified Paths: -------------- branches/PR-7242460/launchd/src/launchd_runtime.c Modified: branches/PR-7242460/launchd/src/launchd_runtime.c =================================================================== --- branches/PR-7242460/launchd/src/launchd_runtime.c 2009-11-18 01:07:18 UTC (rev 23954) +++ branches/PR-7242460/launchd/src/launchd_runtime.c 2009-11-18 01:18:55 UTC (rev 23955) @@ -590,7 +590,7 @@ if (launchd_assumes((bulk_kev_cnt = kevent(fd, NULL, 0, kev, BULK_KEV_MAX, &ts)) != -1)) { #if 0 for (i = 0; i < bulk_kev_cnt; i++) { - log_kevent_struct(LOG_DEBUG, kev, 0); + log_kevent_struct(LOG_DEBUG, &kev[0], i); } #endif for (i = 0; i < bulk_kev_cnt; i++) { @@ -611,7 +611,7 @@ runtime_ktrace0(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_END); } else { runtime_syslog(LOG_ERR, "The following kevent had invalid context data."); - log_kevent_struct(LOG_EMERG, kev, i); + log_kevent_struct(LOG_EMERG, &kev[0], i); } #else runtime_ktrace(RTKT_LAUNCHD_BSD_KEVENT|DBG_FUNC_START, kevi->ident, kevi->filter, kevi->fflags); @@ -863,7 +863,7 @@ for( i = bulk_kev_i + 1; i < bulk_kev_cnt; i++ ) { if( bulk_kev[i].filter == filter && bulk_kev[i].ident == ident ) { runtime_syslog(LOG_DEBUG, "Pruning the following kevent:"); - log_kevent_struct(LOG_DEBUG, bulk_kev, i); + log_kevent_struct(LOG_DEBUG, &bulk_kev[0], i); bulk_kev[i].filter = (short)0; } } -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 18:39:00 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 18:39:00 -0800 (PST) Subject: [launchd-changes] [23956] trunk Message-ID: <20091118023901.CB360338DABF@beta.macosforge.org> Revision: 23956 http://trac.macosforge.org/projects/launchd/changeset/23956 Author: lindak at apple.com Date: 2009-11-17 18:38:58 -0800 (Tue, 17 Nov 2009) Log Message: ----------- 11A47: SecurityAgent no longer visible via Accessibility X2: Dock does not register apps that quit: error -600 Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Property Changed: ---------------- trunk/ trunk/launchd/src/bootstrap.h trunk/launchd/src/bootstrap_priv.h trunk/launchd/src/launch.h trunk/launchd/src/launch_internal.h trunk/launchd/src/launch_priv.h trunk/launchd/src/protocol_vproc.defs trunk/launchd/src/vproc.h trunk/launchd/src/vproc_internal.h trunk/launchd/src/vproc_priv.h Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7178164:23935-23940 + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7084138:23944-23955 /branches/PR-7178164:23935-23940 Property changes on: trunk/launchd/src/bootstrap.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/libbootstrap_public.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_public.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap.h:23828 /branches/PR-7178164/launchd/src/bootstrap.h:23935-23940 + /branches/PR-5898404/launchd/src/libbootstrap_public.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_public.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap.h:23828 /branches/PR-7084138/launchd/src/bootstrap.h:23944-23955 /branches/PR-7178164/launchd/src/bootstrap.h:23935-23940 Property changes on: trunk/launchd/src/bootstrap_priv.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/libbootstrap_private.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_private.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap_priv.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap_priv.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap_priv.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap_priv.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap_priv.h:23828 /branches/PR-7178164/launchd/src/bootstrap_priv.h:23935-23940 + /branches/PR-5898404/launchd/src/libbootstrap_private.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_private.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap_priv.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap_priv.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap_priv.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap_priv.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap_priv.h:23828 /branches/PR-7084138/launchd/src/bootstrap_priv.h:23944-23955 /branches/PR-7178164/launchd/src/bootstrap_priv.h:23935-23940 Property changes on: trunk/launchd/src/launch.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/liblaunch_public.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_public.h:23651-23701 /branches/PR-6271234/launchd/src/launch.h:23818-23822 /branches/PR-6562592/launchd/src/launch.h:23812-23822 /branches/PR-6564965/launchd/src/launch.h:23832-23851 /branches/PR-6589133/launchd/src/launch.h:23810-23822 /branches/PR-6609410/launchd/src/launch.h:23828 /branches/PR-7178164/launchd/src/launch.h:23935-23940 + /branches/PR-5898404/launchd/src/liblaunch_public.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_public.h:23651-23701 /branches/PR-6271234/launchd/src/launch.h:23818-23822 /branches/PR-6562592/launchd/src/launch.h:23812-23822 /branches/PR-6564965/launchd/src/launch.h:23832-23851 /branches/PR-6589133/launchd/src/launch.h:23810-23822 /branches/PR-6609410/launchd/src/launch.h:23828 /branches/PR-7084138/launchd/src/launch.h:23944-23955 /branches/PR-7178164/launchd/src/launch.h:23935-23940 Property changes on: trunk/launchd/src/launch_internal.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/liblaunch_internal.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_internal.h:23651-23701 /branches/PR-6271234/launchd/src/launch_internal.h:23818-23822 /branches/PR-6562592/launchd/src/launch_internal.h:23812-23822 /branches/PR-6564965/launchd/src/launch_internal.h:23832-23851 /branches/PR-6589133/launchd/src/launch_internal.h:23810-23822 /branches/PR-6609410/launchd/src/launch_internal.h:23828 /branches/PR-7178164/launchd/src/launch_internal.h:23935-23940 + /branches/PR-5898404/launchd/src/liblaunch_internal.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_internal.h:23651-23701 /branches/PR-6271234/launchd/src/launch_internal.h:23818-23822 /branches/PR-6562592/launchd/src/launch_internal.h:23812-23822 /branches/PR-6564965/launchd/src/launch_internal.h:23832-23851 /branches/PR-6589133/launchd/src/launch_internal.h:23810-23822 /branches/PR-6609410/launchd/src/launch_internal.h:23828 /branches/PR-7084138/launchd/src/launch_internal.h:23944-23955 /branches/PR-7178164/launchd/src/launch_internal.h:23935-23940 Property changes on: trunk/launchd/src/launch_priv.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/liblaunch_private.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_private.h:23651-23701 /branches/PR-6271234/launchd/src/launch_priv.h:23818-23822 /branches/PR-6562592/launchd/src/launch_priv.h:23812-23822 /branches/PR-6564965/launchd/src/launch_priv.h:23832-23851 /branches/PR-6589133/launchd/src/launch_priv.h:23810-23822 /branches/PR-6609410/launchd/src/launch_priv.h:23828 /branches/PR-7178164/launchd/src/launch_priv.h:23935-23940 + /branches/PR-5898404/launchd/src/liblaunch_private.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_private.h:23651-23701 /branches/PR-6271234/launchd/src/launch_priv.h:23818-23822 /branches/PR-6562592/launchd/src/launch_priv.h:23812-23822 /branches/PR-6564965/launchd/src/launch_priv.h:23832-23851 /branches/PR-6589133/launchd/src/launch_priv.h:23810-23822 /branches/PR-6609410/launchd/src/launch_priv.h:23828 /branches/PR-7084138/launchd/src/launch_priv.h:23944-23955 /branches/PR-7178164/launchd/src/launch_priv.h:23935-23940 Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-11-18 01:18:55 UTC (rev 23955) +++ trunk/launchd/src/launchd_core_logic.c 2009-11-18 02:38:58 UTC (rev 23956) @@ -8608,7 +8608,7 @@ job_handle_mpm_wait(NULL, MACH_PORT_NULL, NULL); } struct ldcred *ldc = runtime_get_caller_creds(); - job_t calling_j = job_mig_intran2(j->mgr, MACH_PORT_NULL, ldc->pid); + job_t calling_j = jobmgr_find_by_pid(j->mgr, ldc->pid, true); return job_mig_wait2(calling_j, j, srp, waitstatus, true); #endif @@ -8627,7 +8627,17 @@ return BOOTSTRAP_NO_MEMORY; } - if( target_j->p == 0 ) { + /* See rdar://problem/7084138 for why we do the second part of this check. + * Basically, since Finder, Dock and SystemUIServer are now real launchd + * jobs, they don't get removed after exiting, like legacy LaunchServices + * jobs do. So there's a race. coreservicesd came in asking for the exit + * status after we'd relaunched Finder, so Finder's PID isn't 0. + * + * So we check to make sure the target job isn't a LaunchServices job and + * that the request is coming through the legacy path (mpm_wait()). If so, + * we return the last exit status, regardless of the current PID value. + */ + if( target_j->p == 0 || (!target_j->legacy_LS_job && legacy) ) { *status = target_j->last_exit_status; return BOOTSTRAP_SUCCESS; } Property changes on: trunk/launchd/src/protocol_vproc.defs ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682/launchd/src/protocol_job.defs:23731-23742 /branches/PR-5898404/launchd/src/protocol_job.defs:23681-23700 /branches/PR-5978442/launchd/src/protocol_job.defs:23651-23701 /branches/PR-6132016/launchd/src/protocol_job.defs:23719-23738 /branches/PR-6271234/launchd/src/protocol_vproc.defs:23818-23822 /branches/PR-6562592/launchd/src/protocol_vproc.defs:23812-23822 /branches/PR-6564965/launchd/src/protocol_vproc.defs:23832-23851 /branches/PR-6589133/launchd/src/protocol_vproc.defs:23810-23822 /branches/PR-6609410/launchd/src/protocol_vproc.defs:23828 /branches/PR-7178164/launchd/src/protocol_vproc.defs:23935-23940 + /branches/PR-5092682/launchd/src/protocol_job.defs:23731-23742 /branches/PR-5898404/launchd/src/protocol_job.defs:23681-23700 /branches/PR-5978442/launchd/src/protocol_job.defs:23651-23701 /branches/PR-6132016/launchd/src/protocol_job.defs:23719-23738 /branches/PR-6271234/launchd/src/protocol_vproc.defs:23818-23822 /branches/PR-6562592/launchd/src/protocol_vproc.defs:23812-23822 /branches/PR-6564965/launchd/src/protocol_vproc.defs:23832-23851 /branches/PR-6589133/launchd/src/protocol_vproc.defs:23810-23822 /branches/PR-6609410/launchd/src/protocol_vproc.defs:23828 /branches/PR-7084138/launchd/src/protocol_vproc.defs:23944-23955 /branches/PR-7178164/launchd/src/protocol_vproc.defs:23935-23940 Property changes on: trunk/launchd/src/vproc.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682/launchd/src/libvproc_public.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_public.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_public.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_public.h:23719-23738 /branches/PR-6271234/launchd/src/vproc.h:23818-23822 /branches/PR-6562592/launchd/src/vproc.h:23812-23822 /branches/PR-6564965/launchd/src/vproc.h:23832-23851 /branches/PR-6589133/launchd/src/vproc.h:23810-23822 /branches/PR-6609410/launchd/src/vproc.h:23828 /branches/PR-7178164/launchd/src/vproc.h:23935-23940 + /branches/PR-5092682/launchd/src/libvproc_public.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_public.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_public.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_public.h:23719-23738 /branches/PR-6271234/launchd/src/vproc.h:23818-23822 /branches/PR-6562592/launchd/src/vproc.h:23812-23822 /branches/PR-6564965/launchd/src/vproc.h:23832-23851 /branches/PR-6589133/launchd/src/vproc.h:23810-23822 /branches/PR-6609410/launchd/src/vproc.h:23828 /branches/PR-7084138/launchd/src/vproc.h:23944-23955 /branches/PR-7178164/launchd/src/vproc.h:23935-23940 Property changes on: trunk/launchd/src/vproc_internal.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/libvproc_internal.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_internal.h:23651-23701 /branches/PR-6271234/launchd/src/vproc_internal.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_internal.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_internal.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_internal.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_internal.h:23828 /branches/PR-7178164/launchd/src/vproc_internal.h:23935-23940 + /branches/PR-5898404/launchd/src/libvproc_internal.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_internal.h:23651-23701 /branches/PR-6271234/launchd/src/vproc_internal.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_internal.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_internal.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_internal.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_internal.h:23828 /branches/PR-7084138/launchd/src/vproc_internal.h:23944-23955 /branches/PR-7178164/launchd/src/vproc_internal.h:23935-23940 Property changes on: trunk/launchd/src/vproc_priv.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682/launchd/src/libvproc_private.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_private.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_private.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_private.h:23719-23738 /branches/PR-6271234/launchd/src/vproc_priv.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_priv.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_priv.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_priv.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_priv.h:23828 /branches/PR-7178164/launchd/src/vproc_priv.h:23935-23940 + /branches/PR-5092682/launchd/src/libvproc_private.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_private.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_private.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_private.h:23719-23738 /branches/PR-6271234/launchd/src/vproc_priv.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_priv.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_priv.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_priv.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_priv.h:23828 /branches/PR-7084138/launchd/src/vproc_priv.h:23944-23955 /branches/PR-7178164/launchd/src/vproc_priv.h:23935-23940 -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Tue Nov 17 19:39:32 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Tue, 17 Nov 2009 19:39:32 -0800 (PST) Subject: [launchd-changes] [23957] tags/launchd-330/ Message-ID: <20091118033933.02EE3338EAF1@beta.macosforge.org> Revision: 23957 http://trac.macosforge.org/projects/launchd/changeset/23957 Author: lindak at apple.com Date: 2009-11-17 19:39:31 -0800 (Tue, 17 Nov 2009) Log Message: ----------- tagging launchd-330 Added Paths: ----------- tags/launchd-330/ Property changes on: tags/launchd-330 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7084138:23944-23955 /branches/PR-7178164:23935-23940 -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Mon Nov 30 15:55:50 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Mon, 30 Nov 2009 15:55:50 -0800 (PST) Subject: [launchd-changes] [23958] trunk Message-ID: <20091130235551.34E7C372A247@beta.macosforge.org> Revision: 23958 http://trac.macosforge.org/projects/launchd/changeset/23958 Author: lindak at apple.com Date: 2009-11-30 15:55:50 -0800 (Mon, 30 Nov 2009) Log Message: ----------- 11A47: SecurityAgent no longer visible via Accessibility Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Property Changed: ---------------- trunk/ trunk/launchd/src/bootstrap.h trunk/launchd/src/bootstrap_priv.h trunk/launchd/src/launch.h trunk/launchd/src/launch_internal.h trunk/launchd/src/launch_priv.h trunk/launchd/src/protocol_vproc.defs trunk/launchd/src/vproc.h trunk/launchd/src/vproc_internal.h trunk/launchd/src/vproc_priv.h Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7084138:23944-23955 /branches/PR-7178164:23935-23940 + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7084138:23944-23955 /branches/PR-7178164:23935-23940 /branches/PR-7386864:23946-23957 Property changes on: trunk/launchd/src/bootstrap.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/libbootstrap_public.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_public.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap.h:23828 /branches/PR-7084138/launchd/src/bootstrap.h:23944-23955 /branches/PR-7178164/launchd/src/bootstrap.h:23935-23940 + /branches/PR-5898404/launchd/src/libbootstrap_public.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_public.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap.h:23828 /branches/PR-7084138/launchd/src/bootstrap.h:23944-23955 /branches/PR-7178164/launchd/src/bootstrap.h:23935-23940 /branches/PR-7386864/launchd/src/bootstrap.h:23946-23957 Property changes on: trunk/launchd/src/bootstrap_priv.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/libbootstrap_private.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_private.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap_priv.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap_priv.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap_priv.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap_priv.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap_priv.h:23828 /branches/PR-7084138/launchd/src/bootstrap_priv.h:23944-23955 /branches/PR-7178164/launchd/src/bootstrap_priv.h:23935-23940 + /branches/PR-5898404/launchd/src/libbootstrap_private.h:23681-23700 /branches/PR-5978442/launchd/src/libbootstrap_private.h:23651-23701 /branches/PR-6271234/launchd/src/bootstrap_priv.h:23818-23822 /branches/PR-6562592/launchd/src/bootstrap_priv.h:23812-23822 /branches/PR-6564965/launchd/src/bootstrap_priv.h:23832-23851 /branches/PR-6589133/launchd/src/bootstrap_priv.h:23810-23822 /branches/PR-6609410/launchd/src/bootstrap_priv.h:23828 /branches/PR-7084138/launchd/src/bootstrap_priv.h:23944-23955 /branches/PR-7178164/launchd/src/bootstrap_priv.h:23935-23940 /branches/PR-7386864/launchd/src/bootstrap_priv.h:23946-23957 Property changes on: trunk/launchd/src/launch.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/liblaunch_public.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_public.h:23651-23701 /branches/PR-6271234/launchd/src/launch.h:23818-23822 /branches/PR-6562592/launchd/src/launch.h:23812-23822 /branches/PR-6564965/launchd/src/launch.h:23832-23851 /branches/PR-6589133/launchd/src/launch.h:23810-23822 /branches/PR-6609410/launchd/src/launch.h:23828 /branches/PR-7084138/launchd/src/launch.h:23944-23955 /branches/PR-7178164/launchd/src/launch.h:23935-23940 + /branches/PR-5898404/launchd/src/liblaunch_public.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_public.h:23651-23701 /branches/PR-6271234/launchd/src/launch.h:23818-23822 /branches/PR-6562592/launchd/src/launch.h:23812-23822 /branches/PR-6564965/launchd/src/launch.h:23832-23851 /branches/PR-6589133/launchd/src/launch.h:23810-23822 /branches/PR-6609410/launchd/src/launch.h:23828 /branches/PR-7084138/launchd/src/launch.h:23944-23955 /branches/PR-7178164/launchd/src/launch.h:23935-23940 /branches/PR-7386864/launchd/src/launch.h:23946-23957 Property changes on: trunk/launchd/src/launch_internal.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/liblaunch_internal.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_internal.h:23651-23701 /branches/PR-6271234/launchd/src/launch_internal.h:23818-23822 /branches/PR-6562592/launchd/src/launch_internal.h:23812-23822 /branches/PR-6564965/launchd/src/launch_internal.h:23832-23851 /branches/PR-6589133/launchd/src/launch_internal.h:23810-23822 /branches/PR-6609410/launchd/src/launch_internal.h:23828 /branches/PR-7084138/launchd/src/launch_internal.h:23944-23955 /branches/PR-7178164/launchd/src/launch_internal.h:23935-23940 + /branches/PR-5898404/launchd/src/liblaunch_internal.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_internal.h:23651-23701 /branches/PR-6271234/launchd/src/launch_internal.h:23818-23822 /branches/PR-6562592/launchd/src/launch_internal.h:23812-23822 /branches/PR-6564965/launchd/src/launch_internal.h:23832-23851 /branches/PR-6589133/launchd/src/launch_internal.h:23810-23822 /branches/PR-6609410/launchd/src/launch_internal.h:23828 /branches/PR-7084138/launchd/src/launch_internal.h:23944-23955 /branches/PR-7178164/launchd/src/launch_internal.h:23935-23940 /branches/PR-7386864/launchd/src/launch_internal.h:23946-23957 Property changes on: trunk/launchd/src/launch_priv.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/liblaunch_private.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_private.h:23651-23701 /branches/PR-6271234/launchd/src/launch_priv.h:23818-23822 /branches/PR-6562592/launchd/src/launch_priv.h:23812-23822 /branches/PR-6564965/launchd/src/launch_priv.h:23832-23851 /branches/PR-6589133/launchd/src/launch_priv.h:23810-23822 /branches/PR-6609410/launchd/src/launch_priv.h:23828 /branches/PR-7084138/launchd/src/launch_priv.h:23944-23955 /branches/PR-7178164/launchd/src/launch_priv.h:23935-23940 + /branches/PR-5898404/launchd/src/liblaunch_private.h:23681-23700 /branches/PR-5978442/launchd/src/liblaunch_private.h:23651-23701 /branches/PR-6271234/launchd/src/launch_priv.h:23818-23822 /branches/PR-6562592/launchd/src/launch_priv.h:23812-23822 /branches/PR-6564965/launchd/src/launch_priv.h:23832-23851 /branches/PR-6589133/launchd/src/launch_priv.h:23810-23822 /branches/PR-6609410/launchd/src/launch_priv.h:23828 /branches/PR-7084138/launchd/src/launch_priv.h:23944-23955 /branches/PR-7178164/launchd/src/launch_priv.h:23935-23940 /branches/PR-7386864/launchd/src/launch_priv.h:23946-23957 Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-11-18 03:39:31 UTC (rev 23957) +++ trunk/launchd/src/launchd_core_logic.c 2009-11-30 23:55:50 UTC (rev 23958) @@ -7673,10 +7673,10 @@ *serviceportp = machservice_port(ms); kr = BOOTSTRAP_SUCCESS; - } else if (!per_pid_lookup && (inherited_bootstrap_port != MACH_PORT_NULL)) { + } else if (inherited_bootstrap_port != MACH_PORT_NULL) { job_log(j, LOG_DEBUG, "Mach service lookup forwarded: %s", servicename); /* Clients potentially check the audit token of the reply to verify that the returned send right is trustworthy. */ - job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, 0, 0) == 0); + job_assumes(j, vproc_mig_look_up2_forward(inherited_bootstrap_port, srp, servicename, target_pid, flags) == 0); /* The previous routine moved the reply port, we're forced to return MIG_NO_REPLY now */ return MIG_NO_REPLY; } else if (pid1_magic && j->anonymous && ldc->euid >= 500 && strcasecmp(j->mgr->name, VPROCMGR_SESSION_LOGINWINDOW) == 0) { Property changes on: trunk/launchd/src/protocol_vproc.defs ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682/launchd/src/protocol_job.defs:23731-23742 /branches/PR-5898404/launchd/src/protocol_job.defs:23681-23700 /branches/PR-5978442/launchd/src/protocol_job.defs:23651-23701 /branches/PR-6132016/launchd/src/protocol_job.defs:23719-23738 /branches/PR-6271234/launchd/src/protocol_vproc.defs:23818-23822 /branches/PR-6562592/launchd/src/protocol_vproc.defs:23812-23822 /branches/PR-6564965/launchd/src/protocol_vproc.defs:23832-23851 /branches/PR-6589133/launchd/src/protocol_vproc.defs:23810-23822 /branches/PR-6609410/launchd/src/protocol_vproc.defs:23828 /branches/PR-7084138/launchd/src/protocol_vproc.defs:23944-23955 /branches/PR-7178164/launchd/src/protocol_vproc.defs:23935-23940 + /branches/PR-5092682/launchd/src/protocol_job.defs:23731-23742 /branches/PR-5898404/launchd/src/protocol_job.defs:23681-23700 /branches/PR-5978442/launchd/src/protocol_job.defs:23651-23701 /branches/PR-6132016/launchd/src/protocol_job.defs:23719-23738 /branches/PR-6271234/launchd/src/protocol_vproc.defs:23818-23822 /branches/PR-6562592/launchd/src/protocol_vproc.defs:23812-23822 /branches/PR-6564965/launchd/src/protocol_vproc.defs:23832-23851 /branches/PR-6589133/launchd/src/protocol_vproc.defs:23810-23822 /branches/PR-6609410/launchd/src/protocol_vproc.defs:23828 /branches/PR-7084138/launchd/src/protocol_vproc.defs:23944-23955 /branches/PR-7178164/launchd/src/protocol_vproc.defs:23935-23940 /branches/PR-7386864/launchd/src/protocol_vproc.defs:23946-23957 Property changes on: trunk/launchd/src/vproc.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682/launchd/src/libvproc_public.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_public.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_public.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_public.h:23719-23738 /branches/PR-6271234/launchd/src/vproc.h:23818-23822 /branches/PR-6562592/launchd/src/vproc.h:23812-23822 /branches/PR-6564965/launchd/src/vproc.h:23832-23851 /branches/PR-6589133/launchd/src/vproc.h:23810-23822 /branches/PR-6609410/launchd/src/vproc.h:23828 /branches/PR-7084138/launchd/src/vproc.h:23944-23955 /branches/PR-7178164/launchd/src/vproc.h:23935-23940 + /branches/PR-5092682/launchd/src/libvproc_public.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_public.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_public.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_public.h:23719-23738 /branches/PR-6271234/launchd/src/vproc.h:23818-23822 /branches/PR-6562592/launchd/src/vproc.h:23812-23822 /branches/PR-6564965/launchd/src/vproc.h:23832-23851 /branches/PR-6589133/launchd/src/vproc.h:23810-23822 /branches/PR-6609410/launchd/src/vproc.h:23828 /branches/PR-7084138/launchd/src/vproc.h:23944-23955 /branches/PR-7178164/launchd/src/vproc.h:23935-23940 /branches/PR-7386864/launchd/src/vproc.h:23946-23957 Property changes on: trunk/launchd/src/vproc_internal.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5898404/launchd/src/libvproc_internal.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_internal.h:23651-23701 /branches/PR-6271234/launchd/src/vproc_internal.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_internal.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_internal.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_internal.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_internal.h:23828 /branches/PR-7084138/launchd/src/vproc_internal.h:23944-23955 /branches/PR-7178164/launchd/src/vproc_internal.h:23935-23940 + /branches/PR-5898404/launchd/src/libvproc_internal.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_internal.h:23651-23701 /branches/PR-6271234/launchd/src/vproc_internal.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_internal.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_internal.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_internal.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_internal.h:23828 /branches/PR-7084138/launchd/src/vproc_internal.h:23944-23955 /branches/PR-7178164/launchd/src/vproc_internal.h:23935-23940 /branches/PR-7386864/launchd/src/vproc_internal.h:23946-23957 Property changes on: trunk/launchd/src/vproc_priv.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/PR-5092682/launchd/src/libvproc_private.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_private.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_private.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_private.h:23719-23738 /branches/PR-6271234/launchd/src/vproc_priv.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_priv.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_priv.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_priv.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_priv.h:23828 /branches/PR-7084138/launchd/src/vproc_priv.h:23944-23955 /branches/PR-7178164/launchd/src/vproc_priv.h:23935-23940 + /branches/PR-5092682/launchd/src/libvproc_private.h:23731-23742 /branches/PR-5898404/launchd/src/libvproc_private.h:23681-23700 /branches/PR-5978442/launchd/src/libvproc_private.h:23651-23701 /branches/PR-6132016/launchd/src/libvproc_private.h:23719-23738 /branches/PR-6271234/launchd/src/vproc_priv.h:23818-23822 /branches/PR-6562592/launchd/src/vproc_priv.h:23812-23822 /branches/PR-6564965/launchd/src/vproc_priv.h:23832-23851 /branches/PR-6589133/launchd/src/vproc_priv.h:23810-23822 /branches/PR-6609410/launchd/src/vproc_priv.h:23828 /branches/PR-7084138/launchd/src/vproc_priv.h:23944-23955 /branches/PR-7178164/launchd/src/vproc_priv.h:23935-23940 /branches/PR-7386864/launchd/src/vproc_priv.h:23946-23957 -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Mon Nov 30 18:00:12 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Mon, 30 Nov 2009 18:00:12 -0800 (PST) Subject: [launchd-changes] [23959] tags/launchd-331/ Message-ID: <20091201020013.242FF372E535@beta.macosforge.org> Revision: 23959 http://trac.macosforge.org/projects/launchd/changeset/23959 Author: lindak at apple.com Date: 2009-11-30 18:00:09 -0800 (Mon, 30 Nov 2009) Log Message: ----------- tagging launchd-331 for Barolo Added Paths: ----------- tags/launchd-331/ Property changes on: tags/launchd-331 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7084138:23944-23955 /branches/PR-7178164:23935-23940 /branches/PR-7386864:23946-23957 -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Mon Nov 30 18:00:56 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Mon, 30 Nov 2009 18:00:56 -0800 (PST) Subject: [launchd-changes] [23960] tags/launchd-331/ Message-ID: <20091201020056.4A89F372E557@beta.macosforge.org> Revision: 23960 http://trac.macosforge.org/projects/launchd/changeset/23960 Author: lindak at apple.com Date: 2009-11-30 18:00:55 -0800 (Mon, 30 Nov 2009) Log Message: ----------- Removed Paths: ------------- tags/launchd-331/ -------------- next part -------------- An HTML attachment was scrubbed... URL: From source_changes at macosforge.org Mon Nov 30 18:01:38 2009 From: source_changes at macosforge.org (source_changes at macosforge.org) Date: Mon, 30 Nov 2009 18:01:38 -0800 (PST) Subject: [launchd-changes] [23961] tags/launchd-331/ Message-ID: <20091201020138.25C43372E56D@beta.macosforge.org> Revision: 23961 http://trac.macosforge.org/projects/launchd/changeset/23961 Author: lindak at apple.com Date: 2009-11-30 18:01:37 -0800 (Mon, 30 Nov 2009) Log Message: ----------- tagging launchd-331 Added Paths: ----------- tags/launchd-331/ Property changes on: tags/launchd-331 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-5092682:23731-23742 /branches/PR-5898404:23681-23700 /branches/PR-5978442:23651-23701 /branches/PR-6132016:23719-23738 /branches/PR-6271234:23818-23822 /branches/PR-6562592:23812-23822 /branches/PR-6564965:23832-23851 /branches/PR-6589133:23810-23822 /branches/PR-6609410:23828 /branches/PR-7084138:23944-23955 /branches/PR-7178164:23935-23940 /branches/PR-7386864:23946-23957 -------------- next part -------------- An HTML attachment was scrubbed... URL: