diff options
-rw-r--r-- | monitor.c | 9 | ||||
-rw-r--r-- | monitor_wrap.c | 9 |
2 files changed, 2 insertions, 16 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor.c,v 1.185 2018/07/11 18:53:29 markus Exp $ */ | 1 | /* $OpenBSD: monitor.c,v 1.186 2018/07/20 03:46:34 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -76,13 +76,6 @@ | |||
76 | #include "kex.h" | 76 | #include "kex.h" |
77 | #include "dh.h" | 77 | #include "dh.h" |
78 | #include "auth-pam.h" | 78 | #include "auth-pam.h" |
79 | #ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ | ||
80 | #undef TARGET_OS_MAC | ||
81 | #include "zlib.h" | ||
82 | #define TARGET_OS_MAC 1 | ||
83 | #else | ||
84 | #include "zlib.h" | ||
85 | #endif | ||
86 | #include "packet.h" | 79 | #include "packet.h" |
87 | #include "auth-options.h" | 80 | #include "auth-options.h" |
88 | #include "sshpty.h" | 81 | #include "sshpty.h" |
diff --git a/monitor_wrap.c b/monitor_wrap.c index 96636aede..3cb26c2ac 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.c,v 1.106 2018/07/11 18:53:29 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.c,v 1.107 2018/07/20 03:46:34 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 3 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> | 4 | * Copyright 2002 Markus Friedl <markus@openbsd.org> |
@@ -61,13 +61,6 @@ | |||
61 | #include "mac.h" | 61 | #include "mac.h" |
62 | #include "log.h" | 62 | #include "log.h" |
63 | #include "auth-pam.h" | 63 | #include "auth-pam.h" |
64 | #ifdef TARGET_OS_MAC /* XXX Broken krb5 headers on Mac */ | ||
65 | #undef TARGET_OS_MAC | ||
66 | #include "zlib.h" | ||
67 | #define TARGET_OS_MAC 1 | ||
68 | #else | ||
69 | #include "zlib.h" | ||
70 | #endif | ||
71 | #include "monitor.h" | 64 | #include "monitor.h" |
72 | #ifdef GSSAPI | 65 | #ifdef GSSAPI |
73 | #include "ssh-gss.h" | 66 | #include "ssh-gss.h" |