diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-07 06:16:11 +0200 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2004-04-07 06:16:11 +0200 |
| commit | a8104b5c92a44774208e6d8b979d583975ba67d4 (patch) | |
| tree | eb3c165215a4cb58982d25a46cd2f817d0c918ad /monitor_wrap.c | |
| parent | - (dtucker) [session.c] Flush stdout after displaying loginmsg. From (diff) | |
| download | openssh-a8104b5c92a44774208e6d8b979d583975ba67d4.tar.xz openssh-a8104b5c92a44774208e6d8b979d583975ba67d4.zip | |
- (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 '')
| -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 b1b1c3a61..9e0417bdc 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" |