diff options
| author | mouring <mouring> | 2004-04-07 04:16:11 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2004-04-07 04:16:11 +0000 |
| commit | 97f85d2189f1b36be80aeaffd8502b14a2a5f26f (patch) | |
| tree | c56daa5c8a09d528ac52f11d10fbf8d88aa210d9 /monitor_wrap.c | |
| parent | 9e6ba3c2bafe2376abf66e80950e683deed7ba5e (diff) | |
| download | openssh-97f85d2189f1b36be80aeaffd8502b14a2a5f26f.tar.gz | |
- (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_wrap.c')
| -rw-r--r-- | monitor_wrap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/monitor_wrap.c b/monitor_wrap.c index b1b1c3a6..9e0417bd 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c @@ -30,6 +30,8 @@ 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" @@ -40,7 +42,6 @@ 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" -#include "zlib.h" #include "monitor.h" #include "monitor_wrap.h" #include "xmalloc.h" |