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

1 files changed, 2 insertions, 0 deletions

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)
                 problem = krb5_init_context(&authctxt->krb5_ctx);
                 if (problem)
                         return (problem);
+#ifdef KRB5_INIT_ETS
                 krb5_init_ets(authctxt->krb5_ctx);
+#endif
         }
         return (0);
 }