File cyrus-imapd-2.3.16-002-strip-out-krb4.patch of Package cyrus-imapd

File cyrus-imapd-2.3.16-002-strip-out-krb4.patch of Package cyrus-imapd (Revision 6fb9a2c1f7370eadd0ea8669bfd716ff)

Currently displaying revision 6fb9a2c1f7370eadd0ea8669bfd716ff , Show latest

From 8e4a444ddf93984aa25ec4a1d860213af2a284ae Mon Sep 17 00:00:00 2001
From: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
Date: Tue, 3 Aug 2010 10:25:42 +0200
Subject: [PATCH 11/13] Strip out krb4

---
 imap/pop3d.c   |    2 --
 imap/version.c |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/imap/pop3d.c b/imap/pop3d.c
index ad3fdd5..3a2cb8b 100644
--- a/imap/pop3d.c
+++ b/imap/pop3d.c
@@ -93,8 +93,6 @@
 #include "statuscache.h"
 
 #ifdef HAVE_KRB
-/* kerberos des is purported to conflict with OpenSSL DES */
-#define DES_DEFS
 #include <krb.h>
 
 /* MIT's kpop authentication kludge */
diff --git a/imap/version.c b/imap/version.c
index 85223c2..d78a696 100644
--- a/imap/version.c
+++ b/imap/version.c
@@ -177,7 +177,7 @@ void id_response(struct protstream *pout)
 	     "; lock = %s", lock_method_desc);
     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
 	     "; nonblock = %s", nonblock_method_desc);
-#ifdef HAVE_KRB
+#if 0
     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
 	     " (%s)", krb4_version);
 #endif
-- 
1.7.2