[evolution-data-server] Bug 596971 - Drop support for Kerberos 4

[Matthew Barnes <mbarnes src gnome org>]

commit 195b9d63064721a040e77d91dc275251e0858c24
Author: H.Habighorst <h habighorst googlemail com>
Date:   Thu Oct 1 20:02:20 2009 -0400

    Bug 596971 - Drop support for Kerberos 4

 camel/Makefile.am                                  |    5 +-
 camel/camel-sasl-kerberos4.c                       |  235 --------------------
 camel/camel-sasl-kerberos4.h                       |   54 -----
 camel/camel-sasl.c                                 |   12 -
 camel/camel.h                                      |    1 -
 configure.ac                                       |   85 +-------
 docs/reference/camel/camel-docs.sgml               |    2 -
 docs/reference/camel/camel-sections.txt            |   15 --
 .../reference/camel/tmpl/camel-sasl-kerberos4.sgml |   33 ---
 docs/reference/camel/tree_index.sgml               |    1 -
 10 files changed, 2 insertions(+), 441 deletions(-)
---
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 5115d0e..e3d160d 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -12,9 +12,7 @@ else
 LIBCAMEL_PLATFORM_DEP_SOURCES = \
 	camel-lock-client.c \
 	camel-stream-process.c
-LIBCAMEL_PROVIDER_PLATFORM_DEP_SOURCES =	\
-	camel-movemail.c			\
-	camel-sasl-kerberos4.c
+LIBCAMEL_PROVIDER_PLATFORM_DEP_SOURCES = camel-movemail.c
 LOCK_HELPER = camel-lock-helper-1.2
 endif
 
@@ -119,7 +117,6 @@ libcamel_providerinclude_HEADERS =		\
 	camel-sasl-cram-md5.h			\
 	camel-sasl-digest-md5.h			\
 	camel-sasl-gssapi.h			\
-	camel-sasl-kerberos4.h			\
 	camel-sasl-login.h			\
 	camel-sasl-ntlm.h			\
 	camel-sasl-plain.h			\
diff --git a/camel/camel-sasl.c b/camel/camel-sasl.c
index 5733b97..908cb47 100644
--- a/camel/camel-sasl.c
+++ b/camel/camel-sasl.c
@@ -30,7 +30,6 @@
 #include "camel-sasl-cram-md5.h"
 #include "camel-sasl-digest-md5.h"
 #include "camel-sasl-gssapi.h"
-#include "camel-sasl-kerberos4.h"
 #include "camel-sasl-login.h"
 #include "camel-sasl-ntlm.h"
 #include "camel-sasl-plain.h"
@@ -201,10 +200,6 @@ camel_sasl_new (const gchar *service_name, const gchar *mechanism, CamelService
 	else if (!strcmp (mechanism, "GSSAPI"))
 		sasl = (CamelSasl *) camel_object_new (CAMEL_SASL_GSSAPI_TYPE);
 #endif
-#ifdef HAVE_KRB4
-	else if (!strcmp (mechanism, "KERBEROS_V4"))
-		sasl = (CamelSasl *) camel_object_new (CAMEL_SASL_KERBEROS4_TYPE);
-#endif
 	else if (!strcmp (mechanism, "PLAIN"))
 		sasl = (CamelSasl *) camel_object_new (CAMEL_SASL_PLAIN_TYPE);
 	else if (!strcmp (mechanism, "LOGIN"))
@@ -241,9 +236,6 @@ camel_sasl_authtype_list (gboolean include_plain)
 #ifdef HAVE_KRB5
 	types = g_list_prepend (types, &camel_sasl_gssapi_authtype);
 #endif
-#ifdef HAVE_KRB4
-	types = g_list_prepend (types, &camel_sasl_kerberos4_authtype);
-#endif
 	types = g_list_prepend (types, &camel_sasl_ntlm_authtype);
 	if (include_plain)
 		types = g_list_prepend (types, &camel_sasl_plain_authtype);
@@ -269,10 +261,6 @@ camel_sasl_authtype (const gchar *mechanism)
 	else if (!strcmp (mechanism, "GSSAPI"))
 		return &camel_sasl_gssapi_authtype;
 #endif
-#ifdef HAVE_KRB4
-	else if (!strcmp (mechanism, "KERBEROS_V4"))
-		return &camel_sasl_kerberos4_authtype;
-#endif
 	else if (!strcmp (mechanism, "PLAIN"))
 		return &camel_sasl_plain_authtype;
 	else if (!strcmp (mechanism, "LOGIN"))
diff --git a/camel/camel.h b/camel/camel.h
index 1965b7d..776b274 100644
--- a/camel/camel.h
+++ b/camel/camel.h
@@ -100,7 +100,6 @@
 #include <camel/camel-sasl-cram-md5.h>
 #include <camel/camel-sasl-digest-md5.h>
 #include <camel/camel-sasl-gssapi.h>
-#include <camel/camel-sasl-kerberos4.h>
 #include <camel/camel-sasl-login.h>
 #include <camel/camel-sasl-ntlm.h>
 #include <camel/camel-sasl-plain.h>
diff --git a/configure.ac b/configure.ac
index 37233cb..b646df5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1153,21 +1153,6 @@ AC_ARG_WITH([krb5-includes],
 	[Location of Kerberos 5 headers]),
 	[with_krb5_includes="$withval"], [with_krb5_includes=""])
 
-AC_ARG_WITH([krb4],
-	AS_HELP_STRING([--with-krb4=PATH],
-	[Location of Kerberos 4 install dir]),
-	[with_krb4="$withval"], [with_krb4="no"])
-
-AC_ARG_WITH([krb4-libs],
-	AS_HELP_STRING([--with-krb4-libs=DIR],
-	[Location of Kerberos 4 libraries]),
-	[with_krb4_libs="$withval"], [with_krb4_libs="$with_krb4/lib"])
-
-AC_ARG_WITH([krb4-includes],
-	AS_HELP_STRING([--with-krb4-includes=DIR],
-	[Location of Kerberos 4 headers]),
-	[with_krb4_includes="$withval"], [with_krb4_includes=""])
-
 dnl ******************************
 dnl Kerberos 5
 dnl ******************************
@@ -1250,76 +1235,8 @@ AC_CHECK_HEADER([com_err.h],
 		#endif
 	]])
 
-dnl ******************************
-dnl Kerberos 4
-dnl ******************************
-msg_krb4="no"
-if test "x${with_krb4}" != "xno"; then
-	LIBS_save="$LIBS"
-	AC_CACHE_CHECK([for Kerberos 4], [ac_cv_lib_kerberos4],
-	[
-		ac_cv_lib_kerberos4="no"
-
-		mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
-		dnl Look for MIT krb5 compat krb4
-		LIBS="$LIBS_save -L$with_krb4_libs $mitcompatlibs"
-		AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
-		[ac_cv_lib_kerberos4="$mitcompatlibs"])
-
-		if test "$ac_cv_lib_kerberos4" = "no"; then
-			dnl Look for KTH krb4
-			LIBS="$LIBS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
-			AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
-			[ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken"])
-		fi
-		if test "$ac_cv_lib_kerberos4" = "no"; then
-			dnl Look for old MIT krb4
-			LIBS="$LIBS_save -L$with_krb4_libs -lkrb"
-			AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
-			[ac_cv_lib_kerberos4="-lkrb"],
-			[
-				LIBS="$LIBS -ldes"
-				AC_LINK_IFELSE([AC_LANG_CALL([], [krb_mk_req])],
-				[ac_cv_lib_kerberos4="-lkrb -ldes"])
-			])
-		fi
-	])
-	LIBS="$LIBS_save"
-	if test "$ac_cv_lib_kerberos4" != "no"; then
-		AC_DEFINE(HAVE_KRB4,1,[Define if you have Krb4])
-		msg_krb4="yes"
-
-		if test -z "$with_krb4_includes"; then
-			if test -f "$with_krb4/include/krb.h" -o -f "$with_krb4/include/port-sockets.h"; then
-				KRB4_CFLAGS="-I$with_krb4/include"
-			fi
-			if test -d "$with_krb4/include/kerberosIV"; then
-				KRB4_CFLAGS="$KRB4_CFLAGS -I$with_krb4/include/kerberosIV"
-			fi
-		else
-			KRB4_CFLAGS="-I$with_krb4_includes"
-		fi
-		KRB4_LIBS="-L$with_krb4_libs $ac_cv_lib_kerberos4"
-
-		CFLAGS_save="$CFLAGS"
-		CFLAGS="$CFLAGS $KRB4_CFLAGS"
-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
-			[[	#include "krb.h"
-				int krb_sendauth;
-			]],
-			[[	return 0	]]
-			)],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO,1,[Need krb_sendauth proto])],[])
-		CFLAGS="$CFLAGS_save"
-	fi
-else
-	AC_MSG_CHECKING([for Kerberos 4])
-	AC_MSG_RESULT([${with_krb4}])
-fi
-
 AC_SUBST(KRB5_CFLAGS)
 AC_SUBST(KRB5_LIBS)
-AC_SUBST(KRB4_CFLAGS)
-AC_SUBST(KRB4_LIBS)
 
 dnl ******************************
 dnl Purify support
@@ -1824,7 +1741,7 @@ echo "
 	Mail Directory:		$system_mail_dir, $system_mail_perm
 	LDAP support:		$msg_ldap
 	NNTP support:		$msg_nntp
-	Kerberos 4/5:		$msg_krb4/$msg_krb5
+	Kerberos 5:		$msg_krb5
 	Gnome Keyring:		$enable_gnome_keyring/$with_gnome_keyring
 	SSL support:		$msg_ssl
 	SMIME support:		$msg_smime
diff --git a/docs/reference/camel/camel-docs.sgml b/docs/reference/camel/camel-docs.sgml
index b3de15d..ca14144 100644
--- a/docs/reference/camel/camel-docs.sgml
+++ b/docs/reference/camel/camel-docs.sgml
@@ -81,7 +81,6 @@
 <!ENTITY CamelSASLCRAMMD5 SYSTEM "xml/camel-sasl-cram-md5.xml">
 <!ENTITY CamelSASLDigestMD5 SYSTEM "xml/camel-sasl-digest-md5.xml">
 <!ENTITY CamelSASLGSSAPI SYSTEM "xml/camel-sasl-gssapi.xml">
-<!ENTITY CamelSASLKerberos4 SYSTEM "xml/camel-sasl-kerberos4.xml">
 <!ENTITY CamelSASLLogin SYSTEM "xml/camel-sasl-login.xml">
 <!ENTITY CamelSASLNTLM SYSTEM "xml/camel-sasl-ntlm.xml">
 <!ENTITY CamelSASLPlain SYSTEM "xml/camel-sasl-plain.xml">
@@ -260,7 +259,6 @@
       &CamelSASLCRAMMD5;
       &CamelSASLDigestMD5;
       &CamelSASLGSSAPI;
-      &CamelSASLKerberos4;
       &CamelSASLLogin;
       &CamelSASLNTLM;
       &CamelSASLPlain;
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 1a7f09d..e104d5b 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -1509,21 +1509,6 @@ camel_sasl_gssapi_get_type
 </SECTION>
 
 <SECTION>
-<FILE>camel-sasl-kerberos4</FILE>
-<TITLE>CamelSaslKerberos4</TITLE>
-CamelSaslKerberos4
-camel_sasl_kerberos4_authtype
-<SUBSECTION Standard>
-CAMEL_SASL_KERBEROS4
-CAMEL_IS_SASL_KERBEROS4
-CAMEL_SASL_KERBEROS4_TYPE
-CAMEL_SASL_KERBEROS4_CLASS
-CamelSaslKerberos4Class
-<SUBSECTION Private>
-camel_sasl_kerberos4_get_type
-</SECTION>
-
-<SECTION>
 <FILE>camel-sasl-login</FILE>
 <TITLE>CamelSaslLogin</TITLE>
 CamelSaslLogin
diff --git a/docs/reference/camel/tree_index.sgml b/docs/reference/camel/tree_index.sgml
index e0f6fab..dbb19a5 100644
--- a/docs/reference/camel/tree_index.sgml
+++ b/docs/reference/camel/tree_index.sgml
@@ -40,7 +40,6 @@
             <link linkend="CamelSaslCramMd5">CamelSaslCramMd5</link>
             <link linkend="CamelSaslDigestMd5">CamelSaslDigestMd5</link>
             <link linkend="CamelSaslGssapi">CamelSaslGssapi</link>
-            <link linkend="CamelSaslKerberos4">CamelSaslKerberos4</link>
             <link linkend="CamelSaslLogin">CamelSaslLogin</link>
             <link linkend="CamelSaslNTLM">CamelSaslNTLM</link>
             <link linkend="CamelSaslPlain">CamelSaslPlain</link>