upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 09:39:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#2016 possibly better macro test for this fix

Browse source
This commit is contained in:
Howard Chu 2002-08-10 00:32:25 +00:00
parent 66d9bf404b
commit 4c69827b15
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libraries/liblutil/passwd.c
View file

@ -23,14 +23,6 @@
#include <ac/string.h>
#include <ac/unistd.h>
/* 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 */
#ifdef SLAPD_SPASSWD
# ifdef HAVE_SASL_SASL_H
# include <sasl/sasl.h>
@ -44,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