- (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 5e4d014..f76094f 100644
--- 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
@@ -2791,4 +2795,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3837 2005/07/07 10:09:35 dtucker Exp $
+$Id: ChangeLog,v 1.3838 2005/07/07 10:33:36 dtucker Exp $
diff --git a/acconfig.h b/acconfig.h
index bb2e62d..79b5e81 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.182 2005/05/27 11:13:41 dtucker Exp $ */
+/* $Id: acconfig.h,v 1.183 2005/07/07 10:33:36 dtucker Exp $ */
/*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@@ -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 6ae4f5f..c7367b4 100644
--- a/auth-krb5.c
+++ b/auth-krb5.c
@@ -54,9 +54,6 @@
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 027b2a4..e7475a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.276 2005/06/19 00:19:43 djm Exp $
+# $Id: configure.ac,v 1.277 2005/07/07 10:33:36 dtucker Exp $
#
# Copyright (c) 1999-2004 Damien Miller
#
@@ -2717,7 +2717,6 @@
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 c642a83..4f02621 100644
--- a/gss-serv-krb5.c
+++ b/gss-serv-krb5.c
@@ -65,9 +65,6 @@
logit("Cannot initialize krb5 context");
return 0;
}
-#ifdef KRB5_INIT_ETS
- krb5_init_ets(krb_context);
-#endif
return 1;
}