OpenLDAP compilation: libraries/liblutil/passwd.c accidently includes des.h from two locations (ITS#2016)

[rstupp@pironet-ndh.com]

Full_Name: Robert Stupp
Version: 2.1.3
OS: Linux 2.4.19-xfs SMP
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (195.135.190.107)


I got a compile error for libraries/liblutil/passwd.c.

It accidently includes des.h from openssl and krb4 include directories.
After I've removed line#27 (#	include <openssl/des.h>), compilation works fine.

configured with: ./configure --enable-crypt --enable-lmpasswd --enable-phonetic
--enable-rewrite --disable-bdb --enable-ldbm --with-cyrus-sasl --enable-spasswd
--enable-kpasswd

openssl-0.9.6c-2.1mdk
krb5-devel-1.2.2-17mdk
cyrus-sasl-2.1.6 (installed from source-dist)



Full compile error:
make[2]: Entering directory `/var/software/openldap-2.1.3/libraries/liblutil'
cc -g -O2 -I../../include        -I../../include       -c -o passwd.o passwd.c
In file included from /usr/include/kerberosIV/krb.h:34,
                 from ../../include/ac/krb.h:22,
                 from passwd.c:39:
/usr/include/kerberosIV/des.h:74: warning: redefinition of `des_cblock'
/usr/include/openssl/des.h:77: warning: `des_cblock' previously declared here
/usr/include/kerberosIV/des.h:95: redefinition of `struct des_ks_struct'
/usr/include/kerberosIV/des.h:95: warning: redefinition of `des_key_schedule'
/usr/include/openssl/des.h:91: warning: `des_key_schedule' previously declared
here
/usr/include/kerberosIV/des.h:116: conflicting types for `bit_64'
/usr/include/openssl/des.h:259: previous declaration of `bit_64'
/usr/include/kerberosIV/des.h:128: conflicting types for `des_key_sched'
/usr/include/openssl/des.h:215: previous declaration of `des_key_sched'
/usr/include/kerberosIV/des.h:132: conflicting types for `des_pcbc_encrypt'
/usr/include/openssl/des.h:199: previous declaration of `des_pcbc_encrypt'
/usr/include/kerberosIV/des.h:137: conflicting types for `des_quad_cksum'
/usr/include/openssl/des.h:201: previous declaration of `des_quad_cksum'
/usr/include/kerberosIV/des.h:142: conflicting types for `des_string_to_key'
/usr/include/openssl/des.h:218: previous declaration of `des_string_to_key'
make[2]: *** [passwd.o] Error 1
make[2]: Leaving directory `/var/software/openldap-2.1.3/libraries/liblutil'
make[1]: *** [all-common] Error 1
make[1]: Leaving directory `/var/software/openldap-2.1.3/libraries'
make: *** [all-common] Error 1