Changeset 23564

Timestamp:

03/21/08 15:53:56 (9 months ago)

Author:

zarzycki@…

Message:

A global launchd.conf for the per-user launchd.

Files:

• trunk/launchd/src/launchctl.c (modified) (2 diffs)

trunk/launchd/src/launchctl.c

@@ -319 +319 @@
 {
         char s[1000], *c, *av[100];
+        const char *file;
         size_t len, i;
         FILE *f;
 
-        if (!(f = fopen("/etc/launchd.conf", "r"))) {
+        if (getppid() == 1) {
+                file = "/etc/launchd.conf";
+        } else {
+                file = "/etc/launchd-user.conf";
+        }
+
+        if (!(f = fopen(file, "r"))) {
                 return;
         }
@@ -1626 +1633 @@
                 }
 
+                if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0) {
+                        read_launchd_conf();
 #if HAVE_SECURITY
-                if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0) {
                         assumes(SessionCreate(sessionKeepCurrentBootstrap, 0) == 0);
-                }
 #endif
+                }
 
                 return load_and_unload_cmd(the_argc, load_launchd_items);