--- Libc/Libc-320/threads/lu_utils.c
+++ Libc/Libc-583/threads/lu_utils.c
@@ -2,8 +2,6 @@
  * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
@@ -41,28 +39,34 @@
 #include <servers/bootstrap.h>
 
 mach_port_t _lu_port = MACH_PORT_NULL;
+mach_port_t _ds_port = MACH_PORT_NULL;
+mach_port_t _mbr_port = MACH_PORT_NULL;
+
 static name_t LOOKUP_NAME = "lookup daemon v2";
 
-mach_port_t _lookupd_port(mach_port_t port) {
-	if (port != MACH_PORT_NULL) {
-		kern_return_t ret;
-		mach_port_t bp;
-		ret = task_get_bootstrap_port(mach_task_self(), &bp);
-		if (ret != KERN_SUCCESS) {
-			mach_error("task_get_bootstrap_port() failed", ret);
-			abort();
-		}
-		if (bp == MACH_PORT_NULL) {
-			mach_error("task_get_bootstrap_port() returned MACH_PORT_NULL!", 0);
-			return MACH_PORT_NULL;
-		}
-		ret = bootstrap_register(bp, LOOKUP_NAME, port);
-		if (ret != BOOTSTRAP_SUCCESS) {
-			mach_error("bootstrap_register() failed", ret);
-			abort();
-		}
-                return port;
+#ifndef kDSStdMachDSLookupPortName
+#define kDSStdMachDSLookupPortName "com.apple.system.DirectoryService.libinfo_v1"
+#define kDSStdMachDSMembershipPortName "com.apple.system.DirectoryService.membership_v1"
+#endif
+
+mach_port_t
+_lookupd_port(mach_port_t port)
+{
+	kern_return_t status;
+
+	if (port != MACH_PORT_NULL)
+	{
+		status = bootstrap_register(bootstrap_port, LOOKUP_NAME, port);
+		if (status != BOOTSTRAP_SUCCESS) abort();
+
+		return port;
 	}
+	else if ((_lu_port == MACH_PORT_NULL) && (getpid() > 1))
+	{
+		status = bootstrap_look_up(bootstrap_port, LOOKUP_NAME, &_lu_port);
+		if ((status != BOOTSTRAP_SUCCESS) && (status != BOOTSTRAP_UNKNOWN_SERVICE)) _lu_port = MACH_PORT_NULL;
+	}
+
 	return _lu_port;
 }
 
@@ -70,67 +74,36 @@
 void
 _lu_fork_child()
 {
-	mach_port_t bp;
-	kern_return_t ret;
-	int pid = getpid();
-
 	_lu_port = MACH_PORT_NULL;
-	if (pid > 2) {
-		ret = task_get_bootstrap_port(mach_task_self(), &bp);
-		if (ret != KERN_SUCCESS) {
-			mach_error("task_get_bootstrap_port() failed", ret);
-			abort();
-		}
-		if (bp == MACH_PORT_NULL) {
-			fprintf(stderr, "task_get_bootstrap_port() returned MACH_PORT_NULL!\n");
-			return;
-		}
-		ret = bootstrap_look_up(bp, LOOKUP_NAME, &_lu_port);
-		if (ret != BOOTSTRAP_SUCCESS && ret != BOOTSTRAP_UNKNOWN_SERVICE) {
-			mach_error("bootstrap_look_up() failed", ret);
-			_lu_port = MACH_PORT_NULL;
-		}
-	}
+	_ds_port = MACH_PORT_NULL;
+	_mbr_port = MACH_PORT_NULL;
 }
 
 void
 _lu_setport(mach_port_t desired)
 {
-	if (_lu_port != MACH_PORT_NULL) {
-		mach_port_deallocate(mach_task_self(), _lu_port);
-	}
+	if (_lu_port != MACH_PORT_NULL) mach_port_deallocate(mach_task_self(), _lu_port);
 	_lu_port = desired;
-}
-
-static int
-port_valid(mach_port_t port)
-{
-	mach_port_type_t ptype;
-	kern_return_t ret;
-	
-	ret = mach_port_type(mach_task_self(), port, &ptype);
-	if (ret != KERN_SUCCESS) {
-		mach_error("mach_port_type() failed", ret);
-		return 0;
-	}
-	return 1;
 }
 
 int
 _lu_running(void)
 {
-	if (_lu_port == MACH_PORT_NULL) {
-		_lu_fork_child();
-	}
-	if (_lu_port != MACH_PORT_NULL) {
-		if (port_valid(_lu_port)) {
-			return (1);
-		}
-		_lu_fork_child();
-		if (port_valid(_lu_port)) {
-			return (1);
-		}
-	}
-	return 0;
+	return ((_lu_port != MACH_PORT_NULL) || (_lookupd_port(MACH_PORT_NULL) != MACH_PORT_NULL));
 }
 
+int
+_ds_running(void)
+{
+	kern_return_t status;
+
+	if (_ds_port != MACH_PORT_NULL) return 1;
+
+	status = bootstrap_look_up(bootstrap_port, kDSStdMachDSLookupPortName, &_ds_port);
+	if ((status != BOOTSTRAP_SUCCESS) && (status != BOOTSTRAP_UNKNOWN_SERVICE)) _ds_port = MACH_PORT_NULL;
+
+	status = bootstrap_look_up(bootstrap_port, kDSStdMachDSMembershipPortName, &_mbr_port);
+	if ((status != BOOTSTRAP_SUCCESS) && (status != BOOTSTRAP_UNKNOWN_SERVICE)) _mbr_port = MACH_PORT_NULL;
+
+	return (_ds_port != MACH_PORT_NULL);
+}