[launchd-changes] [23693] trunk/launchd/src

[source_changes at macosforge.org]

Revision: 23693
          http://trac.macosforge.org/projects/launchd/changeset/23693
Author:   dsorresso at apple.com
Date:     2008-08-22 15:31:47 -0700 (Fri, 22 Aug 2008)
Log Message:
-----------
Rolling back last merge that blew away changes for merge before that.

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

Modified: trunk/launchd/src/launchd_core_logic.c
===================================================================
--- trunk/launchd/src/launchd_core_logic.c	2008-08-22 22:06:26 UTC (rev 23692)
+++ trunk/launchd/src/launchd_core_logic.c	2008-08-22 22:31:47 UTC (rev 23693)
@@ -475,7 +475,6 @@
 static bool job_setup_machport(job_t j);
 static void job_setup_fd(job_t j, int target_fd, const char *path, int flags);
 static void job_postfork_become_user(job_t j);
-static void job_enable_audit_for_user(job_t j, uid_t u, char *name);
 static void job_postfork_test_user(job_t j);
 static void job_log_pids_with_weird_uids(job_t j);
 static void job_force_sampletool(job_t j);
@@ -3356,8 +3355,6 @@
 		desired_gid = gre->gr_gid;
 	}
 
-	job_enable_audit_for_user(j, desired_uid, loginname);
-
 	if (!job_assumes(j, setlogin(loginname) != -1)) {
 		_exit(EXIT_FAILURE);
 	}
@@ -3394,28 +3391,6 @@
 }
 
 void
-job_enable_audit_for_user(job_t j, uid_t u, char *name)
-{
-	auditinfo_t auinfo = {
-		.ai_auid = u,
-		.ai_asid = j->p,
-	};
-	long au_cond;
-
-	if (!job_assumes(j, auditon(A_GETCOND, &au_cond, sizeof(long)) == 0)) {
-		_exit(EXIT_FAILURE);
-	}
-
-	if (au_cond != AUC_NOAUDIT) {
-		if (!job_assumes(j, au_user_mask(name, &auinfo.ai_mask) == 0)) {
-			_exit(EXIT_FAILURE);
-		} else if (!job_assumes(j, setaudit(&auinfo) == 0)) {
-			_exit(EXIT_FAILURE);
-		}
-	}
-}
-
-void
 job_setup_attributes(job_t j)
 {
 	struct limititem *li;
@@ -4201,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

Modified: trunk/launchd/src/rc.netboot
===================================================================
--- trunk/launchd/src/rc.netboot	2008-08-22 22:06:26 UTC (rev 23692)
+++ trunk/launchd/src/rc.netboot	2008-08-22 22:31:47 UTC (rev 23693)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ##
-# Copyright 2002-2008 Apple Inc.
+# Copyright 2002 Apple Computer, Inc.
 #
 # This script configures NetBoot
 ##
@@ -105,11 +105,7 @@
 	return 1
     fi
     case "${mount_from}" in
-	afp:*)
-		fstype=afp
-		kextload /System/Library/Filesystems/AppleShare/asp_tcp.kext
-		kextload /System/Library/Filesystems/AppleShare/afpfs.kext
-		;;
+	afp:*) fstype=afp;;
  	nfs:*) fstype=nfs;;
 	*) echo "unknown network filesystem mount from ${mount_from}"
 	   return 1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/launchd-changes/attachments/20080822/5b592542/attachment.html