Security-58286.20.16.tar.gz

[apple/security.git] / OSX / libsecurityd / lib / ssclient.cpp

diff --git a/OSX/libsecurityd/lib/ssclient.cpp b/OSX/libsecurityd/lib/ssclient.cpp
index 444247aa4638854b7d9d1e598b9c35850b9b2dae..76853a35f620d8936d9dc56455d1b871d332baa8 100644 (file)
--- a/OSX/libsecurityd/lib/ssclient.cpp
+++ b/OSX/libsecurityd/lib/ssclient.cpp
@@ -101,7 +101,6 @@ void ClientSession::activate()
        }
 }
 
        }
 }
 

-

 //
 // The contactName method allows the caller to explicitly override the bootstrap
 // name under which SecurityServer is located. Use this only with great caution,
 //
 // The contactName method allows the caller to explicitly override the bootstrap
 // name under which SecurityServer is located. Use this only with great caution,


@@ -131,7 +130,7 @@ ClientSession::Global::Global()
        serverPort = findSecurityd();
     
        mach_port_t originPort = MACH_PORT_NULL;
        serverPort = findSecurityd();
     
        mach_port_t originPort = MACH_PORT_NULL;

-       IPCN(ucsp_client_verifyPrivileged2(serverPort.port(), mig_get_reply_port(), &securitydCreds, &rcode, &originPort));
+       IPCBASIC(ucsp_client_verifyPrivileged2(serverPort.port(), mig_get_reply_port(), &securitydCreds, &rcode, &originPort));

        if (originPort != serverPort.port())
                CssmError::throwMe(CSSM_ERRCODE_VERIFICATION_FAILURE);
        mach_port_mod_refs(mach_task_self(), originPort, MACH_PORT_RIGHT_SEND, -1);
        if (originPort != serverPort.port())
                CssmError::throwMe(CSSM_ERRCODE_VERIFICATION_FAILURE);
        mach_port_mod_refs(mach_task_self(), originPort, MACH_PORT_RIGHT_SEND, -1);


@@ -143,7 +142,7 @@ ClientSession::Global::Global()
     // cannot use UCSP_ARGS here because it uses mGlobal() -> deadlock
     Thread &thread = this->thread();
        
     // cannot use UCSP_ARGS here because it uses mGlobal() -> deadlock
     Thread &thread = this->thread();
        

-       IPCN(ucsp_client_setup(serverPort, thread.replyPort, &securitydCreds, &rcode,
+       IPCBASIC(ucsp_client_setup(serverPort, thread.replyPort, &securitydCreds, &rcode,

                mach_task_self(), info, extForm));
     thread.registered = true;  // as a side-effect of setup call above
        IFDEBUG(serverPort.requestNotify(thread.replyPort));
                mach_task_self(), info, extForm));
     thread.registered = true;  // as a side-effect of setup call above
        IFDEBUG(serverPort.requestNotify(thread.replyPort));