diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | monitor.c | 7 | ||||
-rw-r--r-- | monitor_wrap.c | 7 |
3 files changed, 15 insertions, 3 deletions
@@ -5,6 +5,8 @@ | |||
5 | back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) | 5 | back and #undef TARGET_OS_MAC instead. (Bug report pending with Apple) |
6 | - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and | 6 | - (dtucker) [defines.h loginrec.c] Define UT_LINESIZE if not defined and |
7 | simplify loginrec.c. ok tim@ | 7 | simplify loginrec.c. ok tim@ |
8 | - (bal) [monitor.c monitor_wrap.c] Ok.. Last time. Promise. Tim suggested | ||
9 | limiting scope and dtucker@ agreed. | ||
8 | 10 | ||
9 | 20040407 | 11 | 20040407 |
10 | - (dtucker) [session.c] Flush stdout after displaying loginmsg. From | 12 | - (dtucker) [session.c] Flush stdout after displaying loginmsg. From |
@@ -955,4 +957,4 @@ | |||
955 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 957 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
956 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 958 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
957 | 959 | ||
958 | $Id: ChangeLog,v 1.3306 2004/04/08 06:16:06 dtucker Exp $ | 960 | $Id: ChangeLog,v 1.3307 2004/04/08 16:12:30 mouring Exp $ |
@@ -37,8 +37,13 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $"); | |||
37 | #include "auth.h" | 37 | #include "auth.h" |
38 | #include "kex.h" | 38 | #include "kex.h" |
39 | #include "dh.h" | 39 | #include "dh.h" |
40 | #undef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ | 40 | #ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ |
41 | #undef TARGET_OS_MAC | ||
41 | #include "zlib.h" | 42 | #include "zlib.h" |
43 | #define TARGET_OS_MAC 1 | ||
44 | #else | ||
45 | #include "zlib.h" | ||
46 | #endif | ||
42 | #include "packet.h" | 47 | #include "packet.h" |
43 | #include "auth-options.h" | 48 | #include "auth-options.h" |
44 | #include "sshpty.h" | 49 | #include "sshpty.h" |
diff --git a/monitor_wrap.c b/monitor_wrap.c index fc506d267..ee2dc2027 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -40,8 +40,13 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); | |||
40 | #include "packet.h" | 40 | #include "packet.h" |
41 | #include "mac.h" | 41 | #include "mac.h" |
42 | #include "log.h" | 42 | #include "log.h" |
43 | #undef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ | 43 | #ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ |
44 | #undef TARGET_OS_MAC | ||
44 | #include "zlib.h" | 45 | #include "zlib.h" |
46 | #define TARGET_OS_MAC 1 | ||
47 | #else | ||
48 | #include "zlib.h" | ||
49 | #endif | ||
45 | #include "monitor.h" | 50 | #include "monitor.h" |
46 | #include "monitor_wrap.h" | 51 | #include "monitor_wrap.h" |
47 | #include "xmalloc.h" | 52 | #include "xmalloc.h" |