diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-08 05:11:03 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-08 05:11:03 +0000 |
| commit | 1b9f2a6b44d09b21304c06e36c3cb4577937c0f9 (patch) | |
| tree | 70c65778baa3cf1eb11f06422a6cf6277abadcb0 | |
| parent | 4d2f361f966db93e473eb455856f28f4340bed68 (diff) | |
- (bal) [monitor.c monitor_wrap.c] Second try. Put the zlib.h headers
back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | monitor.c | 4 | ||||
| -rw-r--r-- | monitor_wrap.c | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -1,6 +1,8 @@ 20040408 - (dtucker) [loginrec.c] Use UT_LINESIZE if available, prevents truncating pty name on Linux 2.6.x systems. Patch from jpe at eisenmenger.org. + - (bal) [monitor.c monitor_wrap.c] Second try. Put the zlib.h headers + back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) 20040407 - (dtucker) [session.c] Flush stdout after displaying loginmsg. From @@ -951,4 +953,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3304 2004/04/08 00:57:05 dtucker Exp $ +$Id: ChangeLog,v 1.3305 2004/04/08 05:11:03 mouring Exp $ @@ -33,12 +33,12 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $"); #include <skey.h> #endif -#include "zlib.h" /* XXX Moved due to conflict on MacOS/X */ - #include "ssh.h" #include "auth.h" #include "kex.h" #include "dh.h" +#undef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ +#include "zlib.h" #include "packet.h" #include "auth-options.h" #include "sshpty.h" diff --git a/monitor_wrap.c b/monitor_wrap.c index 9e0417bd..fc506d26 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -30,8 +30,6 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); #include <openssl/bn.h> #include <openssl/dh.h> -#include "zlib.h" /* XXX Moved due to conflict on MacOS/X */ - #include "ssh.h" #include "dh.h" #include "kex.h" @@ -42,6 +40,8 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); #include "packet.h" #include "mac.h" #include "log.h" +#undef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ +#include "zlib.h" #include "monitor.h" #include "monitor_wrap.h" #include "xmalloc.h" |