fix des.h build issue

diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index a63b4752556a3ad4fe04484961d424208c60bba5..99b09c37b99b09f14c6ee31dc8ce3349fb01d386 100644 (file)
--- 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