[prev in list] [next in list] [prev in thread] [next in thread] 

List:       launchd-changes
Subject:    [launchd-changes] [23476] trunk/launchd/src/launchd_core_logic.c
From:       source_changes () macosforge ! org
Date:       2007-12-21 21:53:38
Message-ID: 20071221215338.71B0E4662A3 () beta ! macosforge ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 23476
          http://trac.macosforge.org/projects/launchd/changeset/23476
Author:   zarzycki@apple.com
Date:     2007-12-21 13:53:37 -0800 (Fri, 21 Dec 2007)

Log Message:
-----------
<rdar://problem/5317778> Bug: launchd_core_logic.c:5810 (23281):0: \
mspolicy_new(target_j, target_service, flags & BOOTSTRAP_ALLOW_LOOKUP, flags & \
BOOTSTRAP_PER_PID_SERVICE, false)

Modified Paths:
--------------
    trunk/launchd/src/launchd_core_logic.c

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2007-12-21 21:37:17 UTC (rev 23475)
+++ trunk/launchd/src/launchd_core_logic.c	2007-12-21 21:53:37 UTC (rev 23476)
@@ -6522,7 +6522,11 @@
 	if (SLIST_EMPTY(&j->mspolicies)) {
 		job_log(j, LOG_DEBUG, "Setting policy on job \"%s\" for Mach service: %s", \
target_j->label, target_service);  if (target_service[0]) {
-			job_assumes(j, mspolicy_new(target_j, target_service, flags & \
BOOTSTRAP_ALLOW_LOOKUP, flags & BOOTSTRAP_PER_PID_SERVICE, false)); +			bool r = \
mspolicy_new(target_j, target_service, flags & BOOTSTRAP_ALLOW_LOOKUP, flags & \
BOOTSTRAP_PER_PID_SERVICE, false); +
+			if (unlikely(!r) && job_assumes(j, errno == EEXIST)) {
+				job_log(j, LOG_ERR, "Tried to update a known policy on PID %u: %s", target_pid, \
target_service); +			}
 		} else {
 			target_j->deny_unknown_mslookups = !(flags & BOOTSTRAP_ALLOW_LOOKUP);
 		}
@@ -6668,6 +6672,7 @@
 		if (msp->per_pid != pid_local) {
 			continue;
 		} else if (strcmp(msp->name, name) == 0) {
+			errno = EEXIST;
 			return false;
 		}
 	}


[Attachment #5 (text/html)]

<!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>[23476] trunk/launchd/src/launchd_core_logic.c</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a \
href="http://trac.macosforge.org/projects/launchd/changeset/23476">23476</a></dd> \
<dt>Author</dt> <dd>zarzycki@apple.com</dd> <dt>Date</dt> <dd>2007-12-21 13:53:37 \
-0800 (Fri, 21 Dec 2007)</dd> </dl>

<h3>Log Message</h3>
<pre>&lt;rdar://problem/5317778&gt; Bug: launchd_core_logic.c:5810 (23281):0: \
mspolicy_new(target_j, target_service, flags &amp; BOOTSTRAP_ALLOW_LOOKUP, flags \
&amp; BOOTSTRAP_PER_PID_SERVICE, false)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunklaunchdsrclaunchd_core_logicc">trunk/launchd/src/launchd_core_logic.c</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunklaunchdsrclaunchd_core_logicc"></a>
<div class="modfile"><h4>Modified: trunk/launchd/src/launchd_core_logic.c (23475 => \
23476)</h4> <pre class="diff"><span>
<span class="info">--- trunk/launchd/src/launchd_core_logic.c	2007-12-21 21:37:17 UTC \
                (rev 23475)
+++ trunk/launchd/src/launchd_core_logic.c	2007-12-21 21:53:37 UTC (rev 23476)
</span><span class="lines">@@ -6522,7 +6522,11 @@
</span><span class="cx"> 	if (SLIST_EMPTY(&amp;j-&gt;mspolicies)) {
</span><span class="cx"> 		job_log(j, LOG_DEBUG, &quot;Setting policy on job \
\&quot;%s\&quot; for Mach service: %s&quot;, target_j-&gt;label, target_service); \
</span><span class="cx"> 		if (target_service[0]) { </span><del>-			job_assumes(j, \
mspolicy_new(target_j, target_service, flags &amp; BOOTSTRAP_ALLOW_LOOKUP, flags \
&amp; BOOTSTRAP_PER_PID_SERVICE, false)); </del><ins>+			bool r = \
mspolicy_new(target_j, target_service, flags &amp; BOOTSTRAP_ALLOW_LOOKUP, flags \
&amp; BOOTSTRAP_PER_PID_SERVICE, false); +
+			if (unlikely(!r) &amp;&amp; job_assumes(j, errno == EEXIST)) {
+				job_log(j, LOG_ERR, &quot;Tried to update a known policy on PID %u: %s&quot;, \
target_pid, target_service); +			}
</ins><span class="cx"> 		} else {
</span><span class="cx"> 			target_j-&gt;deny_unknown_mslookups = !(flags &amp; \
BOOTSTRAP_ALLOW_LOOKUP); </span><span class="cx"> 		}
</span><span class="lines">@@ -6668,6 +6672,7 @@
</span><span class="cx"> 		if (msp-&gt;per_pid != pid_local) {
</span><span class="cx"> 			continue;
</span><span class="cx"> 		} else if (strcmp(msp-&gt;name, name) == 0) {
</span><ins>+			errno = EEXIST;
</ins><span class="cx"> 			return false;
</span><span class="cx"> 		}
</span><span class="cx"> 	}
</span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
launchd-changes mailing list
launchd-changes@lists.macosforge.org
http://lists.macosforge.org/mailman/listinfo/launchd-changes


[prev in list] [next in list] [prev in thread] [next in thread]

Configure | About | News | Add a list | Sponsored by KoreLogic