diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | auth-krb5.c | 2 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
-rw-r--r-- | gss-serv-krb5.c | 2 | ||||
-rw-r--r-- | monitor.c | 3 | ||||
-rw-r--r-- | monitor_wrap.c | 3 |
7 files changed, 22 insertions, 5 deletions
@@ -1,6 +1,13 @@ | |||
1 | 20040407 | 1 | 20040407 |
2 | - (dtucker) [session.c] Flush stdout after displaying loginmsg. From | 2 | - (dtucker) [session.c] Flush stdout after displaying loginmsg. From |
3 | f_mohr at yahoo.de. | 3 | f_mohr at yahoo.de. |
4 | - (bal) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Check to see | ||
5 | if Krb5 library exports krb5_init_etc() since some OSes (like MacOS/X) | ||
6 | are starting to restrict it as internal since it is not needed by | ||
7 | developers any more. (Patch based on Apple tree) | ||
8 | - (bal) [monitor.c monitor_wrap.c] monitor_wrap.c] moved zlib.h higher since | ||
9 | krb5 on MacOS/X conflicts. There may be a better solution, but this will | ||
10 | work for now. | ||
4 | 11 | ||
5 | 20040406 | 12 | 20040406 |
6 | - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use | 13 | - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use |
@@ -940,4 +947,4 @@ | |||
940 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 947 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
941 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 948 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
942 | 949 | ||
943 | $Id: ChangeLog,v 1.3302 2004/04/06 22:04:09 dtucker Exp $ | 950 | $Id: ChangeLog,v 1.3303 2004/04/07 04:16:11 mouring Exp $ |
diff --git a/acconfig.h b/acconfig.h index a1f4556f8..7e788b826 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.174 2004/04/06 11:31:13 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.175 2004/04/07 04:16:11 mouring Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -202,6 +202,9 @@ | |||
202 | /* Define if you don't want to use lastlog in session.c */ | 202 | /* Define if you don't want to use lastlog in session.c */ |
203 | #undef NO_SSH_LASTLOG | 203 | #undef NO_SSH_LASTLOG |
204 | 204 | ||
205 | /* Definite if have krb5_init_ets */ | ||
206 | #undef KRB5_INIT_ETS | ||
207 | |||
205 | /* Define if you don't want to use utmp */ | 208 | /* Define if you don't want to use utmp */ |
206 | #undef DISABLE_UTMP | 209 | #undef DISABLE_UTMP |
207 | 210 | ||
diff --git a/auth-krb5.c b/auth-krb5.c index 859492478..baa1a6317 100644 --- a/auth-krb5.c +++ b/auth-krb5.c | |||
@@ -54,7 +54,9 @@ krb5_init(void *context) | |||
54 | problem = krb5_init_context(&authctxt->krb5_ctx); | 54 | problem = krb5_init_context(&authctxt->krb5_ctx); |
55 | if (problem) | 55 | if (problem) |
56 | return (problem); | 56 | return (problem); |
57 | #ifdef KRB5_INIT_ETS | ||
57 | krb5_init_ets(authctxt->krb5_ctx); | 58 | krb5_init_ets(authctxt->krb5_ctx); |
59 | #endif | ||
58 | } | 60 | } |
59 | return (0); | 61 | return (0); |
60 | } | 62 | } |
diff --git a/configure.ac b/configure.ac index a06452bd9..fa5021cfa 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.210 2004/04/06 11:41:51 dtucker Exp $ | 1 | # $Id: configure.ac,v 1.211 2004/04/07 04:16:11 mouring Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -2240,6 +2240,7 @@ AC_ARG_WITH(kerberos5, | |||
2240 | 2240 | ||
2241 | LIBS="$LIBS $K5LIBS" | 2241 | LIBS="$LIBS $K5LIBS" |
2242 | AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS)) | 2242 | AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS)) |
2243 | AC_SEARCH_LIBS(krb5_init_ets, $K5LIBS, AC_DEFINE(KRB5_INIT_ETS)) | ||
2243 | ] | 2244 | ] |
2244 | ) | 2245 | ) |
2245 | 2246 | ||
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index 8ba3e7182..4e3598ead 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c | |||
@@ -65,7 +65,9 @@ ssh_gssapi_krb5_init() | |||
65 | logit("Cannot initialize krb5 context"); | 65 | logit("Cannot initialize krb5 context"); |
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
68 | #ifdef KRB5_INIT_ETS | ||
68 | krb5_init_ets(krb_context); | 69 | krb5_init_ets(krb_context); |
70 | #endif | ||
69 | 71 | ||
70 | return 1; | 72 | return 1; |
71 | } | 73 | } |
@@ -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" |
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 $"); | |||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
32 | 32 | ||
33 | #include "zlib.h" /* XXX Moved due to conflict on MacOS/X */ | ||
34 | |||
33 | #include "ssh.h" | 35 | #include "ssh.h" |
34 | #include "dh.h" | 36 | #include "dh.h" |
35 | #include "kex.h" | 37 | #include "kex.h" |
@@ -40,7 +42,6 @@ RCSID("$OpenBSD: monitor_wrap.c,v 1.35 2003/11/17 11:06:07 markus Exp $"); | |||
40 | #include "packet.h" | 42 | #include "packet.h" |
41 | #include "mac.h" | 43 | #include "mac.h" |
42 | #include "log.h" | 44 | #include "log.h" |
43 | #include "zlib.h" | ||
44 | #include "monitor.h" | 45 | #include "monitor.h" |
45 | #include "monitor_wrap.h" | 46 | #include "monitor_wrap.h" |
46 | #include "xmalloc.h" | 47 | #include "xmalloc.h" |