- (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.

diff --git a/ChangeLog b/ChangeLog
index efc3f0ba8cb7d32d01f6da02d52806c31dd06a9f..592a06145441979544db7053186e7b6d10a0e6ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 20040407
  - (dtucker) [session.c] Flush stdout after displaying loginmsg.  From
    f_mohr at yahoo.de.
+ - (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.
 
 20040406
  - (dtucker) [acconfig.h configure.ac defines.h] Bug #820: don't use

diff --git a/acconfig.h b/acconfig.h
index d21244b549d766f9d965fef05d6aab402144e95f..bbe1a3f28fb1a60acb71fc3f86ac321b31af51d5 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -202,6 +202,9 @@
 /* Define if you don't want to use lastlog in session.c */
 #undef NO_SSH_LASTLOG
 
+/* Definite if have krb5_init_ets */
+#undef KRB5_INIT_ETS
+
 /* Define if you don't want to use utmp */
 #undef DISABLE_UTMP
 

diff --git a/auth-krb5.c b/auth-krb5.c
index 85949247836df32607f558f0aaa16345ebd9e66b..baa1a631751330bd387def494ce8e746ed7fd442 100644 (file)
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -54,7 +54,9 @@ krb5_init(void *context)
                problem = krb5_init_context(&authctxt->krb5_ctx);
                if (problem)
                        return (problem);
+#ifdef KRB5_INIT_ETS
                krb5_init_ets(authctxt->krb5_ctx);
+#endif
        }
        return (0);
 }

diff --git a/configure.ac b/configure.ac
index 8433916f59f38794243fab55e2242bd5447c53b6..59ebac309242b20def9dd06cafcaaa12f0a5126e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2240,6 +2240,7 @@ AC_ARG_WITH(kerberos5,
 
        LIBS="$LIBS $K5LIBS"
        AC_SEARCH_LIBS(k_hasafs, kafs, AC_DEFINE(USE_AFS))
+       AC_SEARCH_LIBS(krb5_init_ets, $K5LIBS, AC_DEFINE(KRB5_INIT_ETS))
        ]
 )
 

diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c
index 8ba3e7182a734d7ccb4bf375523505862655de1b..4e3598ead1e906e49fa71b57e71f2592b212646e 100644 (file)
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -65,7 +65,9 @@ ssh_gssapi_krb5_init()
                logit("Cannot initialize krb5 context");
                return 0;
        }
+#ifdef KRB5_INIT_ETS
        krb5_init_ets(krb_context);
+#endif
 
        return 1;
 }

diff --git a/monitor.c b/monitor.c
index 30f7258a093421537d4d297d12aa2b48ad70218e..d44f92d5909e251ba624207a05b3e8957115e44d 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -33,11 +33,12 @@ RCSID("$OpenBSD: monitor.c,v 1.55 2004/02/05 05:37:17 dtucker Exp $");
 #include <skey.h>
 #endif
 
+#include "zlib.h"  /* XXX Moved due to conflict on MacOS/X */
+
 #include "ssh.h"
 #include "auth.h"
 #include "kex.h"
 #include "dh.h"
-#include "zlib.h"
 #include "packet.h"
 #include "auth-options.h"
 #include "sshpty.h"

diff --git a/monitor_wrap.c b/monitor_wrap.c
index b1b1c3a61eae652e055c0173be3895f409dcad16..9e0417bdc9980ea9c570bd59764e4d4127d09661 100644 (file)
--- 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"