1 files changed, 8 insertions, 1 deletions

diff --git a/monitor.c b/monitor.c
index 30f7258a0..9c30c1c39 100644
--- a/monitor.c
+++ b/monitor.c
@@ -37,7 +37,13 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
 #include "auth.h"
 #include "kex.h"
 #include "dh.h"
+#ifdef TARGET_OS_MAC    /* XXX Broken krb5 headers on Mac */
+#undef TARGET_OS_MAC
 #include "zlib.h"
+#define TARGET_OS_MAC 1
+#else
+#include "zlib.h"
+#endif
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"
@@ -738,7 +744,8 @@ mm_answer_skeyquery(int socket, Buffer *m)
         char challenge[1024];
         u_int success;
 
-        success = skeychallenge(&skey, authctxt->user, challenge) < 0 ? 0 : 1;
+        success = _compat_skeychallenge(&skey, authctxt->user, challenge,
+            sizeof(challenge)) < 0 ? 0 : 1;
 
         buffer_clear(m);
         buffer_put_int(m, success);