From: Howard Chu <hyc@openldap.org>
Date: Sat, 10 Aug 2002 00:22:52 +0000 (+0000)
Subject: ITS#2016 Don't include <openssl/des.h> if we're also including <krb.h>.
X-Git-Tag: NO_SLAP_OP_BLOCKS~1250
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=66d9bf404b38579c84b5c0c0d238bfe58910f520;p=openldap

ITS#2016 Don't include <openssl/des.h> if we're also including <krb.h>.
---

diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index a63b475255..0d2d5aa355 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -23,7 +23,11 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
-#ifdef SLAPD_LMHASH
+/* KPASSWD/krb.h brings in a conflicting des.h so don't use both.
+ * configure currently requires OpenSSL to enable LMHASH. Obviously
+ * this requirement can be fulfilled by the KRB DES library as well.
+ */
+#if defined(SLAPD_LMHASH) && !defined(SLAPD_KPASSWD)
 #	include <openssl/des.h>
 #endif /* SLAPD_LMHASH */