Modified: trunk/launchd/src/launchd_core_logic.c (23690 => 23691)

--- 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