Changeset 23630

Timestamp:

2008-05-21 16:25:49 (3 months ago)

Author:

zarzycki@…

Message:

Misc.

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (9 diffs)
• reboot2.h (modified) (1 diff)

trunk/launchd/src/launchd_core_logic.c

@@ -389 +389 @@
         unsigned int exit_timeout;
         int stdout_err_fd;
-        uint64_t sent_sigterm_time;
+        uint64_t sent_signal_time;
         uint64_t start_time;
         uint32_t min_run_time;
@@ -633 +633 @@
         }
 
-        j->sent_sigterm_time = runtime_get_opaque_time();
+        j->sent_signal_time = runtime_get_opaque_time();
 
         if (newval < 0) {
@@ -663 +663 @@
 
                 if (j->kill_via_shmem) {
-                        snprintf(extralog, sizeof(extralog), ": %d remaining transactions", j->shmem->vp_shmem_transaction_cnt + 1);
+                        snprintf(extralog, sizeof(extralog), ": %d remaining transactions", newval + 1);
                 } else {
                         extralog[0] = '\0';
@@ -2404 +2404 @@
         }
 
-        if (j->sent_sigterm_time) {
-                uint64_t td_sec, td_usec, td = runtime_get_nanoseconds_since(j->sent_sigterm_time);
+        if (j->sent_signal_time) {
+                uint64_t td_sec, td_usec, td = runtime_get_nanoseconds_since(j->sent_signal_time);
 
                 td_sec = td / NSEC_PER_SEC;
                 td_usec = (td % NSEC_PER_SEC) / NSEC_PER_USEC;
 
-                job_log(j, LOG_INFO, "Exited %lld.%06lld seconds after %s was sent", td_sec, td_usec, signal_to_C_name(SIGTERM));
+                job_log(j, LOG_INFO, "Exited %llu.%06llu seconds after the first signal was sent", td_sec, td_usec);
         }
 
@@ -2449 +2449 @@
         }
         j->last_exit_status = status;
+        j->sent_signal_time = 0;
         j->sent_sigkill = false;
         j->sampled = false;
@@ -2708 +2709 @@
                  */
                 if (j->sent_sigkill) {
-                        uint64_t td = runtime_get_nanoseconds_since(j->sent_sigterm_time);
+                        uint64_t td = runtime_get_nanoseconds_since(j->sent_signal_time);
 
                         td /= NSEC_PER_SEC;
@@ -2889 +2890 @@
                 return;
         }
-
-        j->sent_sigterm_time = 0;
 
         if (likely(!j->legacy_mach_job)) {
@@ -5252 +5251 @@
         pid_t sp;
 
-        if (j->sampled) {
+        if (j->sampled || j->per_user) {
                 return;
         }
+
         j->sampled = true;
 
@@ -7040 +7040 @@
 job_mig_set_service_policy(job_t j, pid_t target_pid, uint64_t flags, name_t target_service)
 {
+        struct ldcred *ldc = runtime_get_caller_creds();
         job_t target_j;
 
         if (!launchd_assumes(j != NULL)) {
                 return BOOTSTRAP_NO_MEMORY;
+        }
+
+        if (unlikely(ldc->euid || ldc->uid)) {
+                return BOOTSTRAP_NOT_PRIVILEGED;
         }
 

trunk/launchd/src/reboot2.h

@@ -27 +27 @@
 __BEGIN_DECLS
 
+#define RB2_FULLREBOOT  0x8000000000000000llu
+
 /* Returns NULL on success. Not NULL on failure */