X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/866f8763175ff60e4fa455b92b5eb660a12fe6c7..8d27c3ff7852f189d80642bf29bad598c79c8e56:/OSX/libsecurityd/lib/ssclient.cpp

diff --git a/OSX/libsecurityd/lib/ssclient.cpp b/OSX/libsecurityd/lib/ssclient.cpp
index 76853a35..6f15092b 100644
--- a/OSX/libsecurityd/lib/ssclient.cpp
+++ b/OSX/libsecurityd/lib/ssclient.cpp
@@ -43,7 +43,6 @@ namespace SecurityServer {
 UnixPlusPlus::StaticForkMonitor ClientSession::mHasForked;
 ModuleNexus<ClientSession::Global> ClientSession::mGlobal;
 const char *ClientSession::mContactName;
-SecGuestRef ClientSession::mDedicatedGuest = kSecNoGuest;
 
 
 //
@@ -93,12 +92,6 @@ void ClientSession::activate()
         secinfo("SSclnt", "Thread registered with %s", mContactName);
 	}
 	
-	// if the thread's guest state has changed, tell securityd
-	if (thread.currentGuest != thread.lastGuest) {
-		IPCN(ucsp_client_setGuest(UCSP_ARGS, thread.currentGuest, kSecCSDefaultFlags));
-		thread.lastGuest = thread.currentGuest;
-		secinfo("SSclnt", "switched guest state to 0x%x", thread.currentGuest);
-	}
 }
 
 //
@@ -173,9 +166,7 @@ Port ClientSession::findSecurityd()
 {
 	if (!mContactName)
 	{
-		mContactName = getenv(SECURITYSERVER_BOOTSTRAP_ENV);
-		if (!mContactName)
-			mContactName = SECURITYSERVER_BOOTSTRAP_NAME;
+		mContactName = SECURITYSERVER_BOOTSTRAP_NAME;
 	}
 
     secinfo("SSclnt", "Locating %s", mContactName);
@@ -198,7 +189,7 @@ void ClientSession::childCheckIn(Port serverPort, Port taskPort)
 	if (originPort != securitydPort.port())
 		CssmError::throwMe(CSSM_ERRCODE_VERIFICATION_FAILURE);
 	mach_port_mod_refs(mach_task_self(), originPort, MACH_PORT_RIGHT_SEND, -1);
-	check(ucsp_client_childCheckIn(securitydPort, serverPort, taskPort));
+	check(ucsp_client_childCheckIn(securitydPort, serverPort, MACH_PORT_NULL));
 }