<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[23564] trunk/launchd/src/launchctl.c</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/launchd/changeset/23564">23564</a></dd>
<dt>Author</dt> <dd>zarzycki@apple.com</dd>
<dt>Date</dt> <dd>2008-03-21 15:53:56 -0700 (Fri, 21 Mar 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>A global launchd.conf for the per-user launchd.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchctlc">trunk/launchd/src/launchctl.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchctlc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchctl.c (23563 => 23564)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchctl.c 2008-03-21 22:52:53 UTC (rev 23563)
+++ trunk/launchd/src/launchctl.c 2008-03-21 22:53:56 UTC (rev 23564)
</span><span class="lines">@@ -318,10 +318,17 @@
</span><span class="cx"> read_launchd_conf(void)
</span><span class="cx"> {
</span><span class="cx"> char s[1000], *c, *av[100];
</span><ins>+ const char *file;
</ins><span class="cx"> size_t len, i;
</span><span class="cx"> FILE *f;
</span><span class="cx">
</span><del>- if (!(f = fopen("/etc/launchd.conf", "r"))) {
</del><ins>+ if (getppid() == 1) {
+ file = "/etc/launchd.conf";
+ } else {
+ file = "/etc/launchd-user.conf";
+ }
+
+ if (!(f = fopen(file, "r"))) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1625,11 +1632,12 @@
</span><span class="cx"> the_argc += 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0) {
+ read_launchd_conf();
</ins><span class="cx"> #if HAVE_SECURITY
</span><del>- if (strcasecmp(session_type, VPROCMGR_SESSION_BACKGROUND) == 0) {
</del><span class="cx"> assumes(SessionCreate(sessionKeepCurrentBootstrap, 0) == 0);
</span><ins>+#endif
</ins><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return load_and_unload_cmd(the_argc, load_launchd_items);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>