April 2009 - launchd-changes - lists.macosforge.org

[23894] trunk/launchd/src/launchd_core_logic.c
by source_changes＠macosforge.org 14 Apr '09

14 Apr '09

Revision: 23894 http://trac.macosforge.org/projects/launchd/changeset/23894 Author: dsorresso(a)apple.com Date: 2009-04-14 14:34:13 -0700 (Tue, 14 Apr 2009) Log Message: ----------- <rdar://problem/6777036> (Embedded security hardening) Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-10 22:38:12 UTC (rev 23893) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-14 21:34:13 UTC (rev 23894) @@ -755,7 +755,6 @@ #if TARGET_OS_EMBEDDED if( g_embedded_privileged_action && s_embedded_privileged_job ) { - #if 0 if( !job_assumes(j, s_embedded_privileged_job->username != NULL && j->username != NULL) ) { errno = EPERM; return; @@ -765,9 +764,6 @@ errno = EPERM; return; } - #else - /* For now, allow this. */ - #endif } else if( g_embedded_privileged_action ) { errno = EINVAL; return; @@ -2985,7 +2981,6 @@ #if TARGET_OS_EMBEDDED if( g_embedded_privileged_action && s_embedded_privileged_job ) { - #if 0 if( !job_assumes(j, s_embedded_privileged_job->username != NULL && j->username != NULL) ) { errno = EPERM; return NULL; @@ -2995,9 +2990,6 @@ errno = EPERM; return NULL; } - #else - /* For now, allow this. */ - #endif } else if( g_embedded_privileged_action ) { errno = EINVAL; return NULL;

1 0

[23893] tags/launchd-315/
by source_changes＠macosforge.org 10 Apr '09

10 Apr '09

Revision: 23893 http://trac.macosforge.org/projects/launchd/changeset/23893 Author: dsorresso(a)apple.com Date: 2009-04-10 15:38:12 -0700 (Fri, 10 Apr 2009) Log Message: ----------- "Tagging launchd-315 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-315/ Property changes on: tags/launchd-315 ___________________________________________________________________ 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

1 0

[23892] trunk/launchd/src
by source_changes＠macosforge.org 10 Apr '09

10 Apr '09

Revision: 23892 http://trac.macosforge.org/projects/launchd/changeset/23892 Author: dsorresso(a)apple.com Date: 2009-04-10 15:06:38 -0700 (Fri, 10 Apr 2009) Log Message: ----------- <rdar://problem/6757199> ResetAtClose should handle the case of a failed exec(2) Modified Paths: -------------- trunk/launchd/src/launch.h trunk/launchd/src/launch_priv.h trunk/launchd/src/launchd_core_logic.c Modified: trunk/launchd/src/launch.h =================================================================== --- trunk/launchd/src/launch.h 2009-04-10 07:43:38 UTC (rev 23891) +++ trunk/launchd/src/launch.h 2009-04-10 22:06:38 UTC (rev 23892) @@ -110,6 +110,7 @@ #define LAUNCH_JOBKEY_MACH_RESETATCLOSE "ResetAtClose" #define LAUNCH_JOBKEY_MACH_HIDEUNTILCHECKIN "HideUntilCheckIn" +#define LAUNCH_JOBKEY_MACH_DRAINMESSAGESONCRASH "DrainMessagesOnCrash" #define LAUNCH_JOBKEY_KEEPALIVE_SUCCESSFULEXIT "SuccessfulExit" #define LAUNCH_JOBKEY_KEEPALIVE_NETWORKSTATE "NetworkState" Modified: trunk/launchd/src/launch_priv.h =================================================================== --- trunk/launchd/src/launch_priv.h 2009-04-10 07:43:38 UTC (rev 23891) +++ trunk/launchd/src/launch_priv.h 2009-04-10 22:06:38 UTC (rev 23892) @@ -75,7 +75,6 @@ #define LAUNCH_JOBKEY_MACH_TASKSPECIALPORT "TaskSpecialPort" #define LAUNCH_JOBKEY_MACH_HOSTSPECIALPORT "HostSpecialPort" #define LAUNCH_JOBKEY_MACH_ENTERKERNELDEBUGGERONCLOSE "EnterKernelDebuggerOnClose" -#define LAUNCH_JOBKEY_MACH_DRAINMESSAGESONCRASH "DrainMessagesOnCrash" typedef struct _launch *launch_t; Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-10 07:43:38 UTC (rev 23891) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-10 22:06:38 UTC (rev 23892) @@ -168,18 +168,21 @@ job_t job; unsigned int gen_num; mach_port_name_t port; - unsigned int isActive :1, - reset :1, - recv :1, - hide :1, - kUNCServer :1, - per_user_hack :1, - debug_on_close :1, - per_pid :1, - delete_on_destruction :1, - drain_one :1, - drain_all :1, - special_port_num :22; + unsigned int isActive :1, + reset :1, + recv :1, + hide :1, + kUNCServer :1, + per_user_hack :1, + debug_on_close :1, + per_pid :1, + delete_on_destruction :1, + drain_one_on_crash :1, + drain_all_on_crash :1, + /* Don't let the size of this field to get too small. It has to be large enough + * to represent the reasonable range of special port numbers. + */ + special_port_num :20; const char name[0]; }; @@ -534,6 +537,7 @@ has_console :1, /* The job owns the console. */ clean_exit_timer_expired :1, /* The job was clean, received SIGKILL and failed to exit after LAUNCHD_CLEAN_KILL_TIMER seconds. */ embedded_special_privileges :1, /* The job runs as a non-root user on embedded but has select privileges of the root user. */ + did_exec :1, /* The job exec(2)ed successfully. */ migratory :1; /* The (anonymous) job called vprocmgr_switch_to_session(). */ mode_t mask; pid_t tracing_pid; @@ -2728,14 +2732,18 @@ j->reaped = true; struct machservice *msi = NULL; - if( j->crashed ) { + if( j->crashed || !(j->did_exec || j->anonymous) ) { SLIST_FOREACH( msi, &j->machservices, sle ) { - if( !msi->isActive && (msi->drain_one || msi->drain_all) ) { + if( j->crashed && !msi->isActive && (msi->drain_one_on_crash || msi->drain_all_on_crash) ) { machservice_drain_port(msi); } + + if( !j->did_exec && msi->reset && job_assumes(j, !msi->isActive) ) { + machservice_resetport(j, msi); + } } } - + struct suspended_peruser *spi = NULL; while( (spi = LIST_FIRST(&j->suspended_perusers)) ) { job_log(j, LOG_ERR, "Job exited before resuming per-user launchd for UID %u. Will forcibly resume.", spi->j->mach_uid); @@ -3270,6 +3278,7 @@ LIST_INSERT_HEAD(&label_hash[hash_label(j->label)], j, label_hash_sle); } } else { + j->did_exec = true; job_log(j, LOG_DEBUG, "Program changed"); } } @@ -3627,6 +3636,7 @@ job_log(j, LOG_DEBUG, "Started as PID: %u", c); + j->did_exec = false; j->checkedin = false; j->start_pending = false; j->reaped = false; @@ -3677,7 +3687,7 @@ SLIST_REMOVE(&j->env, ei, envitem, sle); } } - + if (likely(!j->stall_before_exec)) { job_uncork_fork(j); } @@ -3778,7 +3788,7 @@ errno = psf(NULL, file2exec, NULL, &spattr, (char *const*)argv, environ); job_log_error(j, LOG_ERR, "posix_spawn(\"%s\", ...)", file2exec); - + #if HAVE_SANDBOX out_bad: #endif @@ -5464,9 +5474,9 @@ if( strcasecmp(key, LAUNCH_JOBKEY_MACH_DRAINMESSAGESONCRASH) == 0 ) { const char *option = launch_data_get_string(obj); if( strcasecmp(option, "One") == 0 ) { - ms->drain_one = true; + ms->drain_one_on_crash = true; } else if( strcasecmp(option, "All") == 0 ) { - ms->drain_all = true; + ms->drain_all_on_crash = true; } } break; @@ -6061,14 +6071,13 @@ void machservice_drain_port(struct machservice *ms) { - if (!job_assumes(ms->job, ms->job->crashed == true)) { - return; - } + bool drain_one = ms->drain_one_on_crash; + bool drain_all = ms->drain_all_on_crash; - if( ms->drain_one == false && ms->drain_all == false ) { + if( !job_assumes(ms->job, (drain_one || drain_all) == true) ) { return; } - + job_log(ms->job, LOG_INFO, "Draining %s...", ms->name); char req_buff[sizeof(union __RequestUnion__catch_mach_exc_subsystem) * 2]; @@ -6103,7 +6112,7 @@ break; } } - } while( ms->drain_all && mr != MACH_RCV_TIMED_OUT ); + } while( drain_all && mr != MACH_RCV_TIMED_OUT ); } void @@ -6257,7 +6266,7 @@ * ReceiveRight(N - 1)Returned */ - if( ms->drain_one || ms->drain_all ) { + if( ms->drain_one_on_crash || ms->drain_all_on_crash ) { if( j->crashed && j->reaped ) { job_log(j, LOG_DEBUG, "Job has crashed. Draining port..."); machservice_drain_port(ms); @@ -6267,7 +6276,6 @@ } ms->isActive = false; - if (ms->delete_on_destruction) { machservice_delete(j, ms, false); } else if (ms->reset) { @@ -7588,6 +7596,7 @@ } } + return BOOTSTRAP_SUCCESS; }

1 0

[23891] tags/launchd-258.24/
by source_changes＠macosforge.org 10 Apr '09

10 Apr '09

Revision: 23891 http://trac.macosforge.org/projects/launchd/changeset/23891 Author: dsorresso(a)apple.com Date: 2009-04-10 00:43:38 -0700 (Fri, 10 Apr 2009) Log Message: ----------- "Tagging launchd-258.24 from https://svn.macosforge.org/repository/launchd/branches/SULeopard" Added Paths: ----------- tags/launchd-258.24/

1 0

[23890] branches/SULeopard/launchd.xcodeproj/project.pbxproj
by source_changes＠macosforge.org 10 Apr '09

10 Apr '09

Revision: 23890 http://trac.macosforge.org/projects/launchd/changeset/23890 Author: dsorresso(a)apple.com Date: 2009-04-10 00:43:26 -0700 (Fri, 10 Apr 2009) Log Message: ----------- Added Security framework to launchctl. Modified Paths: -------------- branches/SULeopard/launchd.xcodeproj/project.pbxproj Modified: branches/SULeopard/launchd.xcodeproj/project.pbxproj =================================================================== --- branches/SULeopard/launchd.xcodeproj/project.pbxproj 2009-04-10 01:56:53 UTC (rev 23889) +++ branches/SULeopard/launchd.xcodeproj/project.pbxproj 2009-04-10 07:43:26 UTC (rev 23890) @@ -50,6 +50,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 33C2D68C0F8F2C7A00A21214 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721FBEBB0EA7AE2F0057462B /* Security.framework */; }; 721FBEBC0EA7AE2F0057462B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721FBEBB0EA7AE2F0057462B /* Security.framework */; }; 72B71B7D0EA7E98A00BFE986 /* exc.defs in Sources */ = {isa = PBXBuildFile; fileRef = FC36291F0E9349410054F1A3 /* exc.defs */; settings = {ATTRIBUTES = (Server, ); }; }; FC3627BA0E9343220054F1A3 /* StartupItems.c in Sources */ = {isa = PBXBuildFile; fileRef = FC59A0FD0E8C8ADF00D41150 /* StartupItems.c */; }; @@ -372,6 +373,7 @@ FCC841CC0EA7138700C01666 /* IOKit.framework in Frameworks */, FC3628080E9345E10054F1A3 /* CoreFoundation.framework in Frameworks */, FCD713740E95DE49001B0111 /* libedit.dylib in Frameworks */, + 33C2D68C0F8F2C7A00A21214 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; };

1 0

[23889] trunk/launchd/src
by source_changes＠macosforge.org 10 Apr '09

10 Apr '09

Revision: 23889 http://trac.macosforge.org/projects/launchd/changeset/23889 Author: dsorresso(a)apple.com Date: 2009-04-09 18:56:53 -0700 (Thu, 09 Apr 2009) Log Message: ----------- <rdar://problem/6754652> Tweak per-user suspend and resume Modified Paths: -------------- trunk/launchd/src/launchd_core_logic.c trunk/launchd/src/libvproc.c Modified: trunk/launchd/src/launchd_core_logic.c =================================================================== --- trunk/launchd/src/launchd_core_logic.c 2009-04-09 18:05:32 UTC (rev 23888) +++ trunk/launchd/src/launchd_core_logic.c 2009-04-10 01:56:53 UTC (rev 23889) @@ -399,6 +399,11 @@ #define AUTO_PICK_LEGACY_LABEL (const char *)(~0) #define AUTO_PICK_ANONYMOUS_LABEL (const char *)(~1) +struct suspended_peruser { + LIST_ENTRY(suspended_peruser) sle; + job_t j; +}; + struct job_s { kq_callback kqjob_callback; /* MUST be first element of this structure for benefit of launchd's run loop. */ LIST_ENTRY(job_s) sle; @@ -407,10 +412,9 @@ LIST_ENTRY(job_s) pid_hash_sle; LIST_ENTRY(job_s) label_hash_sle; LIST_ENTRY(job_s) global_env_sle; - LIST_ENTRY(job_s) suspended_peruser_sle; STAILQ_ENTRY(job_s) pending_samples_sle; SLIST_ENTRY(job_s) curious_jobs_sle; - LIST_HEAD(, job_s) suspended_perusers; + LIST_HEAD(, suspended_peruser) suspended_perusers; LIST_HEAD(, waiting_for_exit) exit_watchers; SLIST_HEAD(, socketgroup) sockets; SLIST_HEAD(, calendarinterval) cal_intervals; @@ -2732,14 +2736,15 @@ } } - job_t ji = NULL; - while( (ji = LIST_FIRST(&j->suspended_perusers)) ) { - job_log(j, LOG_ERR, "Job exited before resuming per-user launchd for UID %u. Will forcibly resume.", ji->mach_uid); - ji->peruser_suspend_count--; - if( ji->peruser_suspend_count == 0 ) { - LIST_REMOVE(ji, suspended_peruser_sle); + struct suspended_peruser *spi = NULL; + while( (spi = LIST_FIRST(&j->suspended_perusers)) ) { + job_log(j, LOG_ERR, "Job exited before resuming per-user launchd for UID %u. Will forcibly resume.", spi->j->mach_uid); + spi->j->peruser_suspend_count--; + if( spi->j->peruser_suspend_count == 0 ) { + job_dispatch(spi->j, false); } - job_dispatch(ji, false); + LIST_REMOVE(spi, sle); + free(spi); } struct waiting_for_exit *w4e = NULL; @@ -7148,42 +7153,56 @@ } break; case VPROC_GSK_PERUSER_SUSPEND: - if( pid1_magic && ldc->euid == 0 ) { + if( job_assumes(j, pid1_magic && ldc->euid == 0) ) { mach_port_t junk = MACH_PORT_NULL; job_t jpu = jobmgr_lookup_per_user_context_internal(j, (uid_t)inval, false, &junk); - if( jpu ) { - job_t ji = NULL; - LIST_FOREACH( ji, &j->suspended_perusers, suspended_peruser_sle ) { - if( (int64_t)(ji->mach_uid) == inval ) { - job_log(j, LOG_WARNING, "Job tried to suspend per-user launchd for UID %u twice.", ji->mach_uid); + if( job_assumes(j, jpu != NULL) ) { + struct suspended_peruser *spi = NULL; + LIST_FOREACH( spi, &j->suspended_perusers, sle ) { + if( (int64_t)(spi->j->mach_uid) == inval ) { + job_log(j, LOG_WARNING, "Job tried to suspend per-user launchd for UID %lli twice.", inval); break; } } - - if( ji == NULL ) { - jpu->peruser_suspend_count++; - LIST_INSERT_HEAD(&j->suspended_perusers, jpu, suspended_peruser_sle); - job_stop(jpu); + + if( spi == NULL ) { + job_log(j, LOG_INFO, "Job is suspending the per-user launchd for UID %lli.", inval); + spi = (struct suspended_peruser *)calloc(sizeof(struct suspended_peruser), 1); + if( job_assumes(j, spi != NULL) ) { + spi->j = jpu; + spi->j->peruser_suspend_count++; + LIST_INSERT_HEAD(&j->suspended_perusers, spi, sle); + job_stop(spi->j); + } else { + kr = BOOTSTRAP_NO_MEMORY; + } } } + } else { + kr = 1; } break; case VPROC_GSK_PERUSER_RESUME: - if( pid1_magic && ldc->euid == 0 ) { - job_t ji = NULL, jt = NULL; - LIST_FOREACH_SAFE( ji, &j->suspended_perusers, suspended_peruser_sle, jt ) { - if( (int64_t)(ji->mach_uid) == inval ) { - ji->peruser_suspend_count--; - LIST_REMOVE(ji, suspended_peruser_sle); + if( job_assumes(j, pid1_magic == true) ) { + struct suspended_peruser *spi = NULL, *spt = NULL; + LIST_FOREACH_SAFE( spi, &j->suspended_perusers, sle, spt ) { + if( (int64_t)(spi->j->mach_uid) == inval ) { + spi->j->peruser_suspend_count--; + LIST_REMOVE(spi, sle); + job_log(j, LOG_INFO, "Job is resuming the per-user launchd for UID %lli.", inval); break; } } - if( ji == NULL ) { - job_log(j, LOG_WARNING, "Job tried to resume per-user launchd for UID %llu that it did not suspend.", inval); - } else if( ji->peruser_suspend_count == 0 ) { - job_dispatch(ji, false); + if( !job_assumes(j, spi != NULL) ) { + job_log(j, LOG_WARNING, "Job tried to resume per-user launchd for UID %lli that it did not suspend.", inval); + kr = BOOTSTRAP_NOT_PRIVILEGED; + } else if( spi->j->peruser_suspend_count == 0 ) { + job_dispatch(spi->j, false); + free(spi); } + } else { + kr = 1; } break; case 0: @@ -8437,7 +8456,7 @@ } char name[NAME_MAX]; - snprintf(name, sizeof(name), "bootstrap_subset(%u)->%s[%i]", MACH_PORT_INDEX(requestorport), j->anonymous ? j->prog : j->label, j->p); + snprintf(name, sizeof(name), "%s[%i].subset.%i", j->anonymous ? j->prog : j->label, j->p, MACH_PORT_INDEX(requestorport)); if (!job_assumes(j, (jmr = jobmgr_new(j->mgr, requestorport, MACH_PORT_NULL, false, name, j->audit_session)) != NULL)) { if (unlikely(requestorport == MACH_PORT_NULL)) { Modified: trunk/launchd/src/libvproc.c =================================================================== --- trunk/launchd/src/libvproc.c 2009-04-09 18:05:32 UTC (rev 23888) +++ trunk/launchd/src/libvproc.c 2009-04-10 01:56:53 UTC (rev 23889) @@ -842,8 +842,9 @@ break; } + kern_return_t kr = KERN_FAILURE; mach_port_t mp = vp ? vp->j_port : bootstrap_port; - if (vproc_mig_swap_integer(mp, inval ? key : 0, outval ? key : 0, inval ? *inval : 0, outval ? outval : &dummyval) == 0) { + if ((kr = vproc_mig_swap_integer(mp, inval ? key : 0, outval ? key : 0, inval ? *inval : 0, outval ? outval : &dummyval)) == 0) { switch (key) { case VPROC_GSK_MGR_PID: cached_pid = outval ? *outval : dummyval; @@ -862,10 +863,8 @@ vproc_t pu_vp = vprocmgr_lookup_vproc(peruser_label); if( pu_vp ) { int status = 0; - kern_return_t kr = vproc_mig_wait2(bootstrap_port, pu_vp->j_port, &status); + kr = vproc_mig_wait2(bootstrap_port, pu_vp->j_port, &status); vproc_release(pu_vp); - - syslog(LOG_DEBUG, "%u's suspended launchd exited with status %i (kr = 0x%x).", (uid_t)*inval, status, kr); } break; }

1 0

[23888] tags/launchd-258.23/
by source_changes＠macosforge.org 09 Apr '09

09 Apr '09

Revision: 23888 http://trac.macosforge.org/projects/launchd/changeset/23888 Author: dsorresso(a)apple.com Date: 2009-04-09 11:05:32 -0700 (Thu, 09 Apr 2009) Log Message: ----------- "Tagging launchd-258.23 from https://svn.macosforge.org/repository/launchd/branches/SULeopard" Added Paths: ----------- tags/launchd-258.23/ Property changes on: tags/launchd-258.23 ___________________________________________________________________ Added: svn:ignore + build Added: svn:mergeinfo + /branches/PR-6248586:23722-23747

1 0

[23887] branches/SULeopard/launchd/src/launchctl.c
by source_changes＠macosforge.org 09 Apr '09

09 Apr '09

Revision: 23887 http://trac.macosforge.org/projects/launchd/changeset/23887 Author: dsorresso(a)apple.com Date: 2009-04-09 11:00:35 -0700 (Thu, 09 Apr 2009) Log Message: ----------- <rdar://problem/6772245> launchctl.c doesn't include config.h; HAVE_SECURITY undefined Modified Paths: -------------- branches/SULeopard/launchd/src/launchctl.c Modified: branches/SULeopard/launchd/src/launchctl.c =================================================================== --- branches/SULeopard/launchd/src/launchctl.c 2009-04-08 20:35:10 UTC (rev 23886) +++ branches/SULeopard/launchd/src/launchctl.c 2009-04-09 18:00:35 UTC (rev 23887) @@ -20,6 +20,7 @@ static const char *const __rcs_file_version__ = "$Revision$"; +#include "config.h" #include "launch.h" #include "launch_priv.h" #include "bootstrap.h"

1 0

[23886] tags/launchd-314/
by source_changes＠macosforge.org 08 Apr '09

08 Apr '09

Revision: 23886 http://trac.macosforge.org/projects/launchd/changeset/23886 Author: dsorresso(a)apple.com Date: 2009-04-08 13:35:10 -0700 (Wed, 08 Apr 2009) Log Message: ----------- "Tagging launchd-314 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-314/ Property changes on: tags/launchd-314 ___________________________________________________________________ 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

1 0

[23884] tags/launchd-313/
by source_changes＠macosforge.org 07 Apr '09

07 Apr '09

Revision: 23884 http://trac.macosforge.org/projects/launchd/changeset/23884 Author: dsorresso(a)apple.com Date: 2009-04-07 15:37:53 -0700 (Tue, 07 Apr 2009) Log Message: ----------- "Tagging launchd-313 from https://svn.macosforge.org/repository/launchd/trunk" Added Paths: ----------- tags/launchd-313/ Property changes on: tags/launchd-313 ___________________________________________________________________ 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

1 0