From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 16 Aug 2002 19:30:47 +0000 (+0000)
Subject: fix des.h build issue
X-Git-Tag: OPENLDAP_REL_ENG_2_1_4~19
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5b6737982391173ce09e7cce8ec3546d64b74491;p=openldap

fix des.h build issue
---

diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index a63b475255..99b09c37b9 100644
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -23,10 +23,6 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
-#ifdef SLAPD_LMHASH
-#	include <openssl/des.h>
-#endif /* SLAPD_LMHASH */
-
 #ifdef SLAPD_SPASSWD
 #	ifdef HAVE_SASL_SASL_H
 #		include <sasl/sasl.h>
@@ -40,6 +36,14 @@
 #	include <ac/krb5.h>
 #endif
 
+/* 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(DES_ENCRYPT)
+#	include <openssl/des.h>
+#endif /* SLAPD_LMHASH */
+
 #include <ac/param.h>
 
 #ifdef SLAPD_CRYPT