Tomas Janousek 65f31c
--- cyrus-imapd-2.3.7/imap/version.c.krb4	2005-02-16 22:06:19.000000000 +0100
Tomas Janousek 65f31c
+++ cyrus-imapd-2.3.7/imap/version.c	2007-01-22 15:36:27.000000000 +0100
Tomas Janousek 65f31c
@@ -169,7 +169,7 @@
Tomas Janousek 65f31c
 	     "; lock = %s", lock_method_desc);
Tomas Janousek 65f31c
     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
Tomas Janousek 65f31c
 	     "; nonblock = %s", nonblock_method_desc);
Tomas Janousek 65f31c
-#ifdef HAVE_KRB
Tomas Janousek 65f31c
+#if 0
Tomas Janousek 65f31c
     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
Tomas Janousek 65f31c
 	     " (%s)", krb4_version);
Tomas Janousek 65f31c
 #endif
Tomas Janousek 65f31c
Tomas Janousek 65f31c
--- cyrus-imapd-2.3.7/imap/pop3d.c.krb4	2007-01-22 15:41:14.000000000 +0100
Tomas Janousek 65f31c
+++ cyrus-imapd-2.3.7/imap/pop3d.c	2007-01-22 15:41:15.000000000 +0100
Tomas Janousek 65f31c
@@ -88,8 +88,6 @@
cb950b
 #include "statuscache.h"
Tomas Janousek 65f31c
 
Tomas Janousek 65f31c
 #ifdef HAVE_KRB
Tomas Janousek 65f31c
-/* kerberos des is purported to conflict with OpenSSL DES */
Tomas Janousek 65f31c
-#define DES_DEFS
Tomas Janousek 65f31c
 #include <krb.h>
Tomas Janousek 65f31c
 
Tomas Janousek 65f31c
 /* MIT's kpop authentication kludge */