Changeset 23562

Timestamp:

03/19/08 14:43:25 (9 months ago)

Author:

zarzycki@…

Message:

Don't accidentally machservice_delete() services that are managed with recv-rights.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (3 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -4184 +4184 @@
 
         SLIST_FOREACH(ms, &j->machservices, sle) {
-                if (ms->recv && ms->isActive) {
+                if (ms->recv && machservice_active(ms)) {
                         return "Mach service is still active";
                 }
@@ -4721 +4721 @@
 
                 LIST_FOREACH_SAFE(ms, &port_hash[HASH_PORT(port)], port_hash_sle, next_ms) {
-                        if (ms->port == port) {
+                        if (ms->port == port && !ms->recv) {
                                 machservice_delete(ms->job, ms, true);
                         }
@@ -4812 +4812 @@
         }
 
-        if (ms->recv && job_assumes(j, !ms->isActive)) {
+        if (ms->recv && job_assumes(j, !machservice_active(ms)) {
                 job_assumes(j, launchd_mport_close_recv(ms->port) == KERN_SUCCESS);
         }