Changeset 23269

Timestamp:

05/31/07 11:36:32 (18 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5232921> Auto login after the initial setup is broken.

Files:

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

trunk/launchd/src/launchd_core_logic.c

@@ -261 +261 @@
 
 static jobmgr_t jobmgr_new(jobmgr_t jm, mach_port_t requestorport, mach_port_t transfer_port, bool sflag, const char *name);
+static job_t jobmgr_import2(jobmgr_t jm, launch_data_t pload);
 static jobmgr_t jobmgr_parent(jobmgr_t jm);
 static jobmgr_t jobmgr_do_garbage_collection(jobmgr_t jm);
@@ -354 +355 @@
                         (__builtin_expect(!(e), 0) ? job_log_bug(j, __rcs_file_version__, __FILE__, __LINE__, #e), false : true)
 
-static job_t job_import2(launch_data_t pload);
 static void job_import_keys(launch_data_t obj, const char *key, void *context);
 static void job_import_bool(job_t j, const char *key, bool value);
@@ -1099 +1099 @@
 job_import(launch_data_t pload)
 {
-        job_t j = job_import2(pload);
+        job_t j = jobmgr_import2(root_jobmgr, pload);
 
         if (j == NULL) {
@@ -1118 +1118 @@
 
         for (i = 0; i < c; i++) {
-                if ((ja[i] = job_import2(launch_data_array_get_index(pload, i)))) {
+                if ((ja[i] = jobmgr_import2(root_jobmgr, launch_data_array_get_index(pload, i)))) {
                         errno = 0;
                 }
@@ -1595 +1595 @@
 
 job_t 
-job_import2(launch_data_t pload)
+jobmgr_import2(jobmgr_t jm, launch_data_t pload)
 {
         launch_data_t tmp, ldpa;
@@ -1655 +1655 @@
         } else if (label[0] == '\0' || (strncasecmp(label, "", strlen("com.apple.launchd")) == 0) ||
                         (strtol(label, NULL, 10) != 0)) {
-                jobmgr_log(root_jobmgr, LOG_ERR, "Somebody attempted to use a reserved prefix for a label: %s", label);
+                jobmgr_log(jm, LOG_ERR, "Somebody attempted to use a reserved prefix for a label: %s", label);
                 /* the empty string, com.apple.launchd and number prefixes for labels are reserved */
                 errno = EINVAL;
@@ -1661 +1661 @@
         }
 
-        if ((j = job_new(root_jobmgr, label, prog, argv))) {
+        if ((j = job_new(jm, label, prog, argv))) {
                 launch_data_dict_iterate(pload, job_import_keys, j);
         }
@@ -5704 +5704 @@
         }
 
-        jr = job_import2(input_obj);
+        jr = jobmgr_import2(j->mgr, input_obj);
 
         if (jr == NULL) switch (errno) {