Changeset 23319

Timestamp:

07/27/07 10:59:56 (16 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/5345685> kinit fails with Internal credentials cache error when run by root user over ssh

Location:

trunk/launchd/src

Files:

• launchd_core_logic.c (modified) (1 diff)
• libvproc.c (modified) (3 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -5660 +5660 @@
                                 goto out;
                         }
+                } else if (ldc.uid == 0 && getpid() == 1 && strcmp(session_type, VPROCMGR_SESSION_STANDARDIO) == 0) {
+                        ensure_root_bkgd_setup();
+
+                        SLIST_REMOVE(&j->mgr->parentmgr->submgrs, j->mgr, jobmgr_s, sle);
+                        j->mgr->parentmgr = background_jobmgr;
+                        SLIST_INSERT_HEAD(&j->mgr->parentmgr->submgrs, j->mgr, sle);
                 }
 

trunk/launchd/src/libvproc.c

@@ -100 +100 @@
 {
         launch_data_t output_obj;
-        kern_return_t kr = 1;
-        mach_port_t puc = 0, rootbs = get_root_bootstrap_port();
+        kern_return_t kr = 0;
         bool is_bkgd = (strcmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0);
         int64_t ldpid, lduid;
@@ -111 +110 @@
         if (vproc_swap_integer(NULL, VPROC_GSK_MGR_UID, 0, &lduid) != 0) {
                 return (vproc_err_t)_vprocmgr_move_subset_to_user;
-        }
-
-        if (target_user == 0) {
-                if (ldpid == 1 && rootbs != bootstrap_port) {
-                        return _vprocmgr_init(session_type);
-                }
-
-                task_set_bootstrap_port(mach_task_self(), rootbs);
-                mach_port_deallocate(mach_task_self(), bootstrap_port);
-                bootstrap_port = rootbs;
-
-                return NULL;
         }
 
@@ -136 +123 @@
         }
 
-        if (vproc_mig_lookup_per_user_context(rootbs, target_user, &puc) != 0) {
-                return (vproc_err_t)_vprocmgr_move_subset_to_user;
-        }
-
-        if (is_bkgd) {
-                kr = 0;
+        if (is_bkgd || target_user) {
+                mach_port_t puc = 0, rootbs = get_root_bootstrap_port();
+
+                if (vproc_mig_lookup_per_user_context(rootbs, target_user, &puc) != 0) {
+                        return (vproc_err_t)_vprocmgr_move_subset_to_user;
+                }
+
+                if (is_bkgd) {
+                        task_set_bootstrap_port(mach_task_self(), puc);
+                        mach_port_deallocate(mach_task_self(), bootstrap_port);
+                        bootstrap_port = puc;
+                } else {
+                        kr = vproc_mig_move_subset(puc, bootstrap_port, (char *)session_type);
+                        mach_port_deallocate(mach_task_self(), puc);
+                }
         } else {
-                kr = vproc_mig_move_subset(puc, bootstrap_port, (char *)session_type);
-        }
-
-        if (is_bkgd) {
-                task_set_bootstrap_port(mach_task_self(), puc);
-                mach_port_deallocate(mach_task_self(), bootstrap_port);
-                bootstrap_port = puc;
-        } else {
-                mach_port_deallocate(mach_task_self(), puc);
+                kr = _vprocmgr_init(session_type) ? 1 : 0;
         }