- (dtucker) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Remove

   calls to krb5_init_ets, which has not been required since krb-1.1.x and
   most Kerberos versions no longer export in their public API.  From sxw
   at inf.ed.ac.uk, ok djm@

diff --git a/ChangeLog b/ChangeLog
index 7615114bf97d04da08d4038962ba39df23d896d2..0641b415784461b660bb37eccd3b7bfa00215aa0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
  - (dtucker) [auth-krb5.c] There's no guarantee that snprintf will set errno
    in the case where the buffer is insufficient, so always return ENOMEM.
    Also pointed out by sxw at inf.ed.ac.uk.
+ - (dtucker) [acconfig.h auth-krb5.c configure.ac gss-serv-krb5.c] Remove
+   calls to krb5_init_ets, which has not been required since krb-1.1.x and
+   most Kerberos versions no longer export in their public API.  From sxw
+   at inf.ed.ac.uk, ok djm@
 
 20050706
  - (djm) OpenBSD CVS Sync

diff --git a/acconfig.h b/acconfig.h
index e303dc027acc626165669b93411b9b0a87c9901d..9f0b3b69e2748a40898c68c4e3172d0aae77cc93 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -202,9 +202,6 @@
 /* Define if you don't want to use lastlog in session.c */
 #undef NO_SSH_LASTLOG
 
-/* Define 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 6ae4f5fc4a32df682f85c142d728c6e2570d217e..c7367b49a2772e4d8aacb14de39165cbdda22af8 100644 (file)
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -54,9 +54,6 @@ 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 98f0291c7307f74f453eebdc80ba8c6937449cb6..834331ec6a1658320dd09b3b4848ea077f60ed56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2717,7 +2717,6 @@ 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 c642a83fe16b5de8dbbeb4adddfd2b0c960ffac4..4f02621ddda25083cf99567eec1215a92347abd9 100644 (file)
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -65,9 +65,6 @@ ssh_gssapi_krb5_init(void)
                logit("Cannot initialize krb5 context");
                return 0;
        }
-#ifdef KRB5_INIT_ETS
-       krb5_init_ets(krb_context);
-#endif
 
        return 1;
 }