diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-07 04:16:11 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-07 04:16:11 +0000 |
commit | a8104b5c92a44774208e6d8b979d583975ba67d4 (patch) | |
tree | eb3c165215a4cb58982d25a46cd2f817d0c918ad /monitor.c | |
parent | ac7c998a2d7f89d36c5896c0845b54c595af4cb8 (diff) |
- (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see
if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X)
are starting to restrict it as internal since it is not needed by
developers any more. (Patch based on Apple tree)
- (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since
krb5 on MacOS/X conflicts. There may be a better solution, but this will
work for now.
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -33,11 +33,12 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $"); | |||
33 | #include <skey.h> | 33 | #include <skey.h> |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #include "zlib.h" /* XXX Moved due to conflict on MacOS/X */ | ||
37 | |||
36 | #include "ssh.h" | 38 | #include "ssh.h" |
37 | #include "auth.h" | 39 | #include "auth.h" |
38 | #include "kex.h" | 40 | #include "kex.h" |
39 | #include "dh.h" | 41 | #include "dh.h" |
40 | #include "zlib.h" | ||
41 | #include "packet.h" | 42 | #include "packet.h" |
42 | #include "auth-options.h" | 43 | #include "auth-options.h" |
43 | #include "sshpty.h" | 44 | #include "sshpty.h" |