[launchd-changes] [23691] trunk/launchd/src/launchd_core_logic.c
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 22 15:03:46 PDT 2008
Revision: 23691
http://trac.macosforge.org/projects/launchd/changeset/23691
Author: dsorresso at apple.com
Date: 2008-08-22 15:03:45 -0700 (Fri, 22 Aug 2008)
Log Message:
-----------
Merging in changes for rdar://problem/5874233
Modified Paths:
--------------
trunk/launchd/src/launchd_core_logic.c
Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c 2008-08-22 21:34:46 UTC (rev 23690)
+++ trunk/launchd/src/launchd_core_logic.c 2008-08-22 22:03:45 UTC (rev 23691)
@@ -3662,13 +3662,13 @@
}
if (unlikely(j->debug)) {
- oldmask = runtime_setlogmask(LOG_UPTO(LOG_DEBUG));
+ oldmask = setlogmask(LOG_UPTO(LOG_DEBUG));
}
runtime_vsyslog(&attr, newmsg, ap);
if (unlikely(j->debug)) {
- runtime_setlogmask(oldmask);
+ setlogmask(oldmask);
}
}
@@ -4176,7 +4176,11 @@
return;
}
- envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env);
+ if( strncmp(LAUNCHD_TRUSTED_FD_ENV, key, sizeof(LAUNCHD_TRUSTED_FD_ENV) - 1) ) {
+ envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env);
+ } else {
+ job_log(j, LOG_WARNING, "Ignoring reserved environmental variable: %s", key);
+ }
}
bool
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080822/9edcbfe4/attachment.html
More information about the launchd-changes
mailing list