Changeset 23013

Timestamp:

01/18/07 12:37:42 (23 months ago)

Author:

zarzycki@…

Message:

Fix the last checkin.

Location:

trunk/launchd/src

Files:

• launchctl.c (modified) (1 diff)
• launchd_core_logic.c (modified) (1 diff)

trunk/launchd/src/launchctl.c

@@ -555 +555 @@
                                 if (strcasecmp(lus->session_type, allowed_session) == 0) {
                                         skipjob = false;
+                                        /* we have to do the following so job_reparent_hack() works within launchd */
+                                        tmpa = launch_data_new_string(lus->session_type);
+                                        launch_data_dict_insert(thejob, tmpa, LAUNCH_JOBKEY_LIMITLOADTOSESSIONTYPE);
                                         break;
                                 }

trunk/launchd/src/launchd_core_logic.c

@@ -1289 +1289 @@
                         return;
                 } else if (strcasecmp(key, LAUNCH_JOBKEY_LIMITLOADTOSESSIONTYPE) == 0) {
-                        for (i = 0; i < value_cnt; i++) {
-                                str = launch_data_get_string(launch_data_array_get_index(value, i));
-                                if (job_assumes(j, str != NULL)) {
-                                        job_reparent_hack(j, str);
-                                }
-                        }
+                        job_log(j, LOG_NOTICE, "launchctl should have transformed the \"%s\" array to a string", LAUNCH_JOBKEY_LIMITLOADTOSESSIONTYPE);
+                        return;
                 }
                 break;