Revision: 23674 http://trac.macosforge.org/projects/launchd/changeset/23674 Author: zarzycki@apple.com Date: 2008-08-18 23:39:43 -0700 (Mon, 18 Aug 2008) Log Message: ----------- Bug from eons ago... 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-19 05:05:17 UTC (rev 23673) +++ trunk/launchd/src/launchd_core_logic.c 2008-08-19 06:39:43 UTC (rev 23674) @@ -3662,13 +3662,13 @@ } if (unlikely(j->debug)) { - oldmask = setlogmask(LOG_UPTO(LOG_DEBUG)); + oldmask = runtime_setlogmask(LOG_UPTO(LOG_DEBUG)); } runtime_vsyslog(&attr, newmsg, ap); if (unlikely(j->debug)) { - setlogmask(oldmask); + runtime_setlogmask(oldmask); } } @@ -4176,7 +4176,9 @@ return; } - envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + if (fastpath(strcasecmp(key, LAUNCHD_TRUSTED_FD_ENV) == 0)) { + envitem_new(j, key, launch_data_get_string(obj), j->importing_global_env); + } } bool