Security-54.1.7.tar.gz

[apple/security.git] / cdsa / cdsa_utilities / machrunloopserver.cpp

diff --git a/cdsa/cdsa_utilities/machrunloopserver.cpp b/cdsa/cdsa_utilities/machrunloopserver.cpp
index 93fc8f29ecc3e553977514a3acdd3fc14275dd40..3a621a2142d4791e2ba7c88bc958ed975f870a3f 100644 (file)
--- a/cdsa/cdsa_utilities/machrunloopserver.cpp
+++ b/cdsa/cdsa_utilities/machrunloopserver.cpp
@@ -20,8 +20,8 @@
 // machrunloopserver - C++ shell for writing Mach 3 servers called by CFRunLoop
 //
 #include "machrunloopserver.h"
 // machrunloopserver - C++ shell for writing Mach 3 servers called by CFRunLoop
 //
 #include "machrunloopserver.h"

+#include <Security/cfutilities.h>

 #include <mach/mach_error.h>
 #include <mach/mach_error.h>

-#include <CoreFoundation/CoreFoundation.h>

 #include <Security/debugging.h>
 
 
 #include <Security/debugging.h>
 
 


@@ -154,7 +154,7 @@ void MachRunLoopServer::oneRequest(mach_msg_header_t *request)
        // MIG dispatch handled the call. Send reply back to caller.
        // This boilerplate stolen from mach_msg_server, since MIG can't seem to
        // generate send-only code for replies (without explicit simpleroutines).
        // MIG dispatch handled the call. Send reply back to caller.
        // This boilerplate stolen from mach_msg_server, since MIG can't seem to
        // generate send-only code for replies (without explicit simpleroutines).

-       if (kern_return_t err = mach_msg_overwrite_trap(replyBuffer,
+       if (kern_return_t err = mach_msg_overwrite(replyBuffer,

                (MACH_MSGH_BITS_REMOTE(replyBuffer->msgh_bits) == MACH_MSG_TYPE_MOVE_SEND_ONCE) ?
                MACH_SEND_MSG : MACH_SEND_MSG|MACH_SEND_TIMEOUT,
                replyBuffer->msgh_size, 0, MACH_PORT_NULL,
                (MACH_MSGH_BITS_REMOTE(replyBuffer->msgh_bits) == MACH_MSG_TYPE_MOVE_SEND_ONCE) ?
                MACH_SEND_MSG : MACH_SEND_MSG|MACH_SEND_TIMEOUT,
                replyBuffer->msgh_size, 0, MACH_PORT_NULL,