[launchd-changes] [23752] trunk/launchd/src/launchctl.c

[source_changes at macosforge.org]

Revision: 23752
          http://trac.macosforge.org/projects/launchd/changeset/23752
Author:   dsorresso at apple.com
Date:     2008-11-10 13:29:44 -0800 (Mon, 10 Nov 2008)
Log Message:
-----------
<rdar://problem/6357173> can't log into AFP OD account with launchd-289

Deactivated change for 

<rdar://problem/5279345> Background agents in home directory

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

Modified: trunk/launchd/src/launchctl.c
===================================================================
--- trunk/launchd/src/launchctl.c	2008-11-06 23:53:11 UTC (rev 23751)
+++ trunk/launchd/src/launchctl.c	2008-11-10 21:29:44 UTC (rev 23752)
@@ -1635,9 +1635,11 @@
 	} else {
 		char *load_launchd_items[] = { "load", "-S", session_type, "-D", "all", NULL, NULL, NULL, NULL, NULL, NULL };
 		int the_argc = 5;
-
+		
+		/*
 		char *load_launchd_items_user[] = { "load", "-S", session_type, "-D", "user", NULL };
 		int the_argc_user = 0;
+		*/
 		
 		if (is_safeboot()) {
 			load_launchd_items[4] = "system";
@@ -1661,9 +1663,11 @@
 				 * jobs in the local sessions may be responsible for mounting the home
 				 * directory.
 				 */
+				/*
 				if( getppid() != 1 ) {
 					the_argc_user = 5;
 				}
+				*/
 			}
 		} else if (strcasecmp(session_type, VPROCMGR_SESSION_AQUA) == 0) {
 			load_launchd_items[5] = "/etc/mach_init_per_user.d";
@@ -1678,6 +1682,7 @@
 		}
 
 		int retval = load_and_unload_cmd(the_argc, load_launchd_items);
+	#if 0 /* Maybe someday. */
 		if( retval == 0 && the_argc_user != 0 ) {
 			optind = 1;
 			/* Load user jobs. But first, we tell launchd to resume listening to
@@ -1690,6 +1695,7 @@
 				retval = load_and_unload_cmd(the_argc_user, load_launchd_items_user);
 			}
 		}
+	#endif
 		
 		return retval;
 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/launchd-changes/attachments/20081110/0679cf73/attachment.html>