<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23630] trunk/launchd/src</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23630">23630</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-05-21 16:25:49 -0700 (Wed, 21 May 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Misc.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
<li><a href="#trunklaunchdsrcreboot2h">trunk/launchd/src/reboot2.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23629 => 23630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c 2008-05-20 20:42:28 UTC (rev 23629)
+++ trunk/launchd/src/launchd_core_logic.c 2008-05-21 23:25:49 UTC (rev 23630)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> unsigned int timeout;
</span><span class="cx"> unsigned int exit_timeout;
</span><span class="cx"> int stdout_err_fd;
</span><del>- uint64_t sent_sigterm_time;
</del><ins>+ uint64_t sent_signal_time;
</ins><span class="cx"> uint64_t start_time;
</span><span class="cx"> uint32_t min_run_time;
</span><span class="cx"> uint32_t start_interval;
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- j->sent_sigterm_time = runtime_get_opaque_time();
</del><ins>+ j->sent_signal_time = runtime_get_opaque_time();
</ins><span class="cx">
</span><span class="cx"> if (newval < 0) {
</span><span class="cx"> job_kill(j);
</span><span class="lines">@@ -662,7 +662,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (j->kill_via_shmem) {
</span><del>- snprintf(extralog, sizeof(extralog), ": %d remaining transactions", j->shmem->vp_shmem_transaction_cnt + 1);
</del><ins>+ snprintf(extralog, sizeof(extralog), ": %d remaining transactions", newval + 1);
</ins><span class="cx"> } else {
</span><span class="cx"> extralog[0] = '\0';
</span><span class="cx"> }
</span><span class="lines">@@ -2403,13 +2403,13 @@
</span><span class="cx"> j->wait_reply_port = MACH_PORT_NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (j->sent_sigterm_time) {
- uint64_t td_sec, td_usec, td = runtime_get_nanoseconds_since(j->sent_sigterm_time);
</del><ins>+ if (j->sent_signal_time) {
+ uint64_t td_sec, td_usec, td = runtime_get_nanoseconds_since(j->sent_signal_time);
</ins><span class="cx">
</span><span class="cx"> td_sec = td / NSEC_PER_SEC;
</span><span class="cx"> td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC;
</span><span class="cx">
</span><del>- job_log(j, LOG_INFO, "Exited %lld.%06lld seconds after %s was sent", td_sec, td_usec, signal_to_C_name(SIGTERM));
</del><ins>+ job_log(j, LOG_INFO, "Exited %llu.%06llu seconds after the first signal was sent", td_sec, td_usec);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> timeradd(&ru.ru_utime, &j->ru.ru_utime, &j->ru.ru_utime);
</span><span class="lines">@@ -2448,6 +2448,7 @@
</span><span class="cx"> j->mgr->normal_active_cnt--;
</span><span class="cx"> }
</span><span class="cx"> j->last_exit_status = status;
</span><ins>+ j->sent_signal_time = 0;
</ins><span class="cx"> j->sent_sigkill = false;
</span><span class="cx"> j->sampled = false;
</span><span class="cx"> j->sent_kill_via_shmem = false;
</span><span class="lines">@@ -2707,7 +2708,7 @@
</span><span class="cx"> * with the long SIGKILL
</span><span class="cx"> */
</span><span class="cx"> if (j->sent_sigkill) {
</span><del>- uint64_t td = runtime_get_nanoseconds_since(j->sent_sigterm_time);
</del><ins>+ uint64_t td = runtime_get_nanoseconds_since(j->sent_signal_time);
</ins><span class="cx">
</span><span class="cx"> td /= NSEC_PER_SEC;
</span><span class="cx"> td -= j->exit_timeout;
</span><span class="lines">@@ -2889,8 +2890,6 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- j->sent_sigterm_time = 0;
-
</del><span class="cx"> if (likely(!j->legacy_mach_job)) {
</span><span class="cx"> sipc = (!SLIST_EMPTY(&j->sockets) || !SLIST_EMPTY(&j->machservices));
</span><span class="cx"> }
</span><span class="lines">@@ -5251,9 +5250,10 @@
</span><span class="cx"> int wstatus;
</span><span class="cx"> pid_t sp;
</span><span class="cx">
</span><del>- if (j->sampled) {
</del><ins>+ if (j->sampled || j->per_user) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> j->sampled = true;
</span><span class="cx">
</span><span class="cx"> if (!job_assumes(j, do_apple_internal_logging)) {
</span><span class="lines">@@ -7039,12 +7039,17 @@
</span><span class="cx"> kern_return_t
</span><span class="cx"> job_mig_set_service_policy(job_t j, pid_t target_pid, uint64_t flags, name_t target_service)
</span><span class="cx"> {
</span><ins>+ struct ldcred *ldc = runtime_get_caller_creds();
</ins><span class="cx"> job_t target_j;
</span><span class="cx">
</span><span class="cx"> if (!launchd_assumes(j != NULL)) {
</span><span class="cx"> return BOOTSTRAP_NO_MEMORY;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (unlikely(ldc->euid || ldc->uid)) {
+ return BOOTSTRAP_NOT_PRIVILEGED;
+ }
+
</ins><span class="cx"> if (unlikely(!SLIST_EMPTY(&j->mspolicies))) {
</span><span class="cx"> job_log(j, LOG_WARNING, "Jobs that have policies assigned to them may not set policies.");
</span><span class="cx"> return BOOTSTRAP_NOT_PRIVILEGED;
</span></span></pre></div>
<a id="trunklaunchdsrcreboot2h"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/reboot2.h (23629 => 23630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/reboot2.h 2008-05-20 20:42:28 UTC (rev 23629)
+++ trunk/launchd/src/reboot2.h 2008-05-21 23:25:49 UTC (rev 23630)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx">
</span><span class="cx"> __BEGIN_DECLS
</span><span class="cx">
</span><ins>+#define RB2_FULLREBOOT 0x8000000000000000llu
+
</ins><span class="cx"> /* Returns NULL on success. Not NULL on failure */
</span><span class="cx">
</span><span class="cx"> __attribute__((visibility("default"))) void *reboot2(uint64_t flags);
</span></span></pre>
</div>
</div>
</body>
</html>