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 a63b4752556a3ad4fe04484961d424208c60bba5..0d2d5aa35556238c8ad01b0b078db7e5e9a0df3f 100644 (file)
--- 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 */