Merge branch 'legacy_63'

[~andy/fetchmail] / kerberos.h

diff --git a/kerberos.h b/kerberos.h
index 32cb93e993106bb28fc213dd35d5342156c88511..ae3d3db59e6c4863717dfa9202d25c12cbbad916 100644 (file)
--- a/kerberos.h
+++ b/kerberos.h
@@ -6,28 +6,12 @@
 
 #ifndef H_KERBEROS__
 #define H_KERBEROS__
+
 #include  "config.h"
-#if defined(KERBEROS_V4) || defined(KERBEROS_V5)
 
 #ifdef KERBEROS_V5
 #include <krb5.h>
-#include <com_err.h>
-#endif
-
-#ifdef KERBEROS_V4
-#  if defined (__bsdi__) 
-#    include <des.h> /* order of includes matters */
-#    define krb_get_err_text(e) (krb_err_txt[e])
-#  endif
-#  include <krb.h>
-#  if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__)
-#    define krb_get_err_text(e) (krb_err_txt[e])
-#    include <des.h>
-#  endif
-#endif
-
-/* des.h might define _ for no good reason.  */
-#undef _
+/* #include <com_err.h> */
+#endif /* KERBEROS_V5 */
 
-#endif /* KERBEROS_V4 || KERBEROS_V5 */
 #endif /* H_KERBEROS__ */