Changeset 23131

Timestamp:

03/04/07 15:59:52 (21 months ago)

Author:

zarzycki@…

Message:

<rdar://problem/4421331> Per session launchd deployment for CLI / PAM sessions

Location:

trunk/launchd/src

Files:

• liblaunch.c (modified) (4 diffs)
• libvproc.c (modified) (2 diffs)
• libvproc_internal.h (modified) (1 diff)
• libvproc_private.h (modified) (2 diffs)

trunk/launchd/src/liblaunch.c

@@ -41 +41 @@
 #include "libbootstrap_public.h"
 #include "libvproc_public.h"
+#include "libvproc_private.h"
 #include "libvproc_internal.h"
 
@@ -1164 +1165 @@
 load_launchd_jobs_at_loginwindow_prompt(int flags __attribute__((unused)), ...)
 {
-        _vproc_move_subset_to_user("LoginWindow");
+        _vprocmgr_move_subset_to_user(geteuid() ? geteuid() : getuid(), "LoginWindow");
 }
 
@@ -1172 +1173 @@
         mach_port_t bezel_ui_server;
         struct stat sb;
-
-        if (_vproc_move_subset_to_user("Aqua")) {
+        uid_t target_user = geteuid() ? geteuid() : getuid();
+
+        if (_vprocmgr_move_subset_to_user(target_user, "Aqua")) {
                 return -1;
         }
@@ -1182 +1184 @@
 
         if (!(stat(BEZEL_UI_PLIST, &sb) == 0 && S_ISREG(sb.st_mode))) {
-                if (bootstrap_create_server(bootstrap_port, BEZEL_UI_PATH, 0, true, &bezel_ui_server) == BOOTSTRAP_SUCCESS) {
+                if (bootstrap_create_server(bootstrap_port, BEZEL_UI_PATH, target_user, true, &bezel_ui_server) == BOOTSTRAP_SUCCESS) {
                         mach_port_t srv;
 

trunk/launchd/src/libvproc.c

@@ -48 +48 @@
 
 vproc_err_t
-_vproc_move_subset_to_user(char *session_type)
+_vprocmgr_move_subset_to_user(uid_t target_user, char *session_type)
 {
         kern_return_t kr = 1;
         mach_port_t puc = 0, which_port = bootstrap_port;
 
-        if ((getuid() || geteuid()) && vproc_mig_lookup_per_user_context(bootstrap_port, 0, &puc) == 0) {
+        if (target_user && vproc_mig_lookup_per_user_context(bootstrap_port, target_user, &puc) == 0) {
                 which_port = puc;
         }
@@ -63 +63 @@
         }
 
-        return kr == 0 ? NULL : (vproc_err_t)_vproc_move_subset_to_user;
+        return kr == 0 ? NULL : (vproc_err_t)_vprocmgr_move_subset_to_user;
 }
 

trunk/launchd/src/libvproc_internal.h

@@ -58 +58 @@
 kern_return_t _vprocmgr_getsocket(name_t);
 
-vproc_err_t _vproc_move_subset_to_user(char *session_type);
-
 void _vproc_logv(int pri, int err, const char *msg, va_list ap);
 

trunk/launchd/src/libvproc_private.h

@@ -21 +21 @@
  */
 
+#include <sys/types.h>
 #include <sys/cdefs.h>
 #include <sys/syslog.h>
@@ -35 +36 @@
 void _vproc_log_error(int pri, const char *msg, ...) __attribute__((format(printf, 2, 3)));
 
+vproc_err_t _vprocmgr_move_subset_to_user(uid_t target_user, char *session_type);
+
 #pragma GCC visibility pop