mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 01:49:11 +00:00
Code Issues Releases Wiki Activity

Move LDAP library checks to m4/ldap.m4 and make more tests cacheable.

Browse Source
This commit is contained in:
Todd C. Miller 2022-12-05 16:52:34 -07:00
parent 00e22508a7
commit 12da6bd0ce
5 changed files with 252 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST
View File

@ -426,6 +426,7 @@ m4/ax_func_getaddrinfo.m4
m4/ax_func_snprintf.m4 m4/ax_func_snprintf.m4
m4/ax_prog_cc_for_build.m4 m4/ax_prog_cc_for_build.m4
m4/hardening.m4 m4/hardening.m4
m4/ldap.m4
m4/libtool.m4 m4/libtool.m4
m4/ltoptions.m4 m4/ltoptions.m4
m4/ltsugar.m4 m4/ltsugar.m4

1
aclocal.m4 vendored
View File

@ -19,6 +19,7 @@ m4_include([m4/ax_func_getaddrinfo.m4])
m4_include([m4/ax_func_snprintf.m4]) m4_include([m4/ax_func_snprintf.m4])
m4_include([m4/ax_prog_cc_for_build.m4]) m4_include([m4/ax_prog_cc_for_build.m4])
m4_include([m4/hardening.m4]) m4_include([m4/hardening.m4])
m4_include([m4/ldap.m4])
m4_include([m4/libtool.m4]) m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4]) m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4]) m4_include([m4/ltsugar.m4])

237
configure vendored
View File

@ -30275,9 +30275,10 @@ fi
COMMON_OBJS="${COMMON_OBJS} event_select.lo" COMMON_OBJS="${COMMON_OBJS} event_select.lo"
fi fi
if test ${with_ldap-'no'} != "no"; then
O_LDFLAGS="$LDFLAGS" if test ${with_ldap-'no'} != "no"; then
if test "$with_ldap" != "yes"; then O_LDFLAGS="$LDFLAGS"
if test "$with_ldap" != "yes"; then
if test ${SUDOERS_LDFLAGS+y} if test ${SUDOERS_LDFLAGS+y}
@ -30350,8 +30351,8 @@ fi
fi fi
LDFLAGS="$LDFLAGS -L${with_ldap}/lib" LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
if test -d "${with_ldap}/lib64"; then if test -d "${with_ldap}/lib64"; then
if test ${SUDOERS_LDFLAGS+y} if test ${SUDOERS_LDFLAGS+y}
@ -30424,8 +30425,8 @@ fi
fi fi
LDFLAGS="$LDFLAGS -L${with_ldap}/lib64" LDFLAGS="$LDFLAGS -L${with_ldap}/lib64"
fi fi
if test ${CPPFLAGS+y} if test ${CPPFLAGS+y}
then : then :
@ -30460,22 +30461,22 @@ else case e in #(
esac esac
fi fi
with_ldap=yes with_ldap=yes
fi fi
SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo ldap_conf.lo" SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo ldap_conf.lo"
case "$SUDOERS_OBJS" in case "$SUDOERS_OBJS" in
*ldap_util.lo*) ;; *ldap_util.lo*) ;;
*) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";; *) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";;
esac esac
LDAP="" LDAP=""
_LIBS="$LIBS" _LIBS="$LIBS"
LDAP_LIBS="" LDAP_LIBS=""
IBMLDAP_EXTRA="" IBMLDAP_EXTRA=""
found=no found=no
# On HP-UX, libibmldap has a hidden dependency on libCsup # On HP-UX, libibmldap has a hidden dependency on libCsup
case "$host_os" in case "$host_os" in
hpux*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lCsup" >&5 hpux*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lCsup" >&5
printf %s "checking for main in -lCsup... " >&6; } printf %s "checking for main in -lCsup... " >&6; }
if test ${ac_cv_lib_Csup_main+y} if test ${ac_cv_lib_Csup_main+y}
then : then :
@ -30514,8 +30515,8 @@ then :
IBMLDAP_EXTRA=" -lCsup" IBMLDAP_EXTRA=" -lCsup"
fi fi
;; ;;
esac esac
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing ldap_init" >&5
printf %s "checking for library containing ldap_init... " >&6; } printf %s "checking for library containing ldap_init... " >&6; }
if test ${ac_cv_search_ldap_init+y} if test ${ac_cv_search_ldap_init+y}
then : then :
@ -30580,37 +30581,28 @@ if test "$ac_res" != no
then : then :
test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
test "${ac_cv_search_ldap_init}" != "none required" && LDAP_LIBS="${ac_cv_search_ldap_init}" test "${ac_cv_search_ldap_init}" != "none required" && LDAP_LIBS="${ac_cv_search_ldap_init}"
found=yes found=yes
fi fi
# If nothing linked, try -lldap and hope for the best # If nothing linked, try -lldap and hope for the best
if test "$found" = "no"; then if test "$found" = "no"; then
LDAP_LIBS="-lldap" LDAP_LIBS="-lldap"
fi fi
LIBS="${_LIBS} ${LDAP_LIBS}" LIBS="${_LIBS} ${LDAP_LIBS}"
OLIBS="$LIBS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lber.h defines LBER_OPT_DEBUG_LEVEL" >&5 #
printf %s "checking whether lber.h defines LBER_OPT_DEBUG_LEVEL... " >&6; } # Check if we need to link with -llber for ber_set_option()
cat confdefs.h - <<_ACEOF >conftest.$ac_ext #
/* end confdefs.h. */ OLIBS="$LIBS"
#include <sys/types.h> ac_fn_check_decl "$LINENO" "LBER_OPT_DEBUG_LEVEL" "ac_cv_have_decl_LBER_OPT_DEBUG_LEVEL" "$ac_includes_default
# include <lber.h> #include <lber.h>
int " "$ac_c_undeclared_builtin_options" "CFLAGS"
main (void) if test "x$ac_cv_have_decl_LBER_OPT_DEBUG_LEVEL" = xyes
{
int opt=LBER_OPT_DEBUG_LEVEL;
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then : then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing ber_set_option" >&5
printf "%s\n" "yes" >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing ber_set_option" >&5
printf %s "checking for library containing ber_set_option... " >&6; } printf %s "checking for library containing ber_set_option... " >&6; }
if test ${ac_cv_search_ber_set_option+y} if test ${ac_cv_search_ber_set_option+y}
then : then :
@ -30680,24 +30672,23 @@ else case e in #(
esac esac
fi fi
if test X"$found" = X"yes" -a X"$LIBS" != X"$OLIBS"; then if test X"$found" = X"yes" -a X"$LIBS" != X"$OLIBS"; then
LDAP_LIBS="$LDAP_LIBS -llber" LDAP_LIBS="$LDAP_LIBS -llber"
fi fi
fi
LIBS="$OLIBS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lber.h is needed when including ldap.h" >&5
printf %s "checking whether lber.h is needed when including ldap.h... " >&6; }
if test ${sudo_cv_header_lber_h+y}
then :
printf %s "(cached) " >&6
else case e in #( else case e in #(
e) e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
printf "%s\n" "no" >&6; }
;;
esac
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether lber.h is needed" >&5
printf %s "checking whether lber.h is needed... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/types.h> #include <sys/types.h>
# include <ldap.h> #include <ldap.h>
int int
main (void) main (void)
{ {
@ -30708,22 +30699,31 @@ main (void)
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO" if ac_fn_c_try_link "$LINENO"
then : then :
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; } # No need to explicitly include lber.h when including ldap.h.
sudo_cv_header_lber_h=no
else case e in #( else case e in #(
e) e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 sudo_cv_header_lber_h=yes
printf "%s\n" "yes" >&6; } ;;
printf "%s\n" "#define HAVE_LBER_H 1" >>confdefs.h
;;
esac esac
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \ rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
;;
esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $sudo_cv_header_lber_h" >&5
printf "%s\n" "$sudo_cv_header_lber_h" >&6; }
if test X"$sudo_cv_header_lber_h" = X"yes"; then
printf "%s\n" "#define HAVE_LBER_H 1" >>confdefs.h
if test ${enable_sasl-'yes'} = "yes"; then fi
found_sasl_h=no
for ac_header in sasl/sasl.h sasl.h if test ${enable_sasl-'yes'} = "yes"; then
found_sasl_h=no
for ac_header in sasl/sasl.h sasl.h
do : do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@ -30733,29 +30733,29 @@ then :
#define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1 #define `printf "%s\n" "HAVE_$ac_header" | sed "$as_sed_cpp"` 1
_ACEOF _ACEOF
found_sasl_h=yes found_sasl_h=yes
ac_fn_c_check_func "$LINENO" "ldap_sasl_interactive_bind_s" "ac_cv_func_ldap_sasl_interactive_bind_s" ac_fn_c_check_func "$LINENO" "ldap_sasl_interactive_bind_s" "ac_cv_func_ldap_sasl_interactive_bind_s"
if test "x$ac_cv_func_ldap_sasl_interactive_bind_s" = xyes if test "x$ac_cv_func_ldap_sasl_interactive_bind_s" = xyes
then : then :
printf "%s\n" "#define HAVE_LDAP_SASL_INTERACTIVE_BIND_S 1" >>confdefs.h printf "%s\n" "#define HAVE_LDAP_SASL_INTERACTIVE_BIND_S 1" >>confdefs.h
fi fi
break break
fi fi
done done
if test X${enable_sasl} = X"yes"; then if test X${enable_sasl} = X"yes"; then
if test X"$found_sasl_h" != X"yes"; then if test X"$found_sasl_h" != X"yes"; then
as_fn_error $? "--enable-sasl specified but unable to locate SASL development headers." "$LINENO" 5 as_fn_error $? "--enable-sasl specified but unable to locate SASL development headers." "$LINENO" 5
fi fi
if test X"$ac_cv_func_ldap_sasl_interactive_bind_s" != X"yes"; then : if test X"$ac_cv_func_ldap_sasl_interactive_bind_s" != X"yes"; then :
as_fn_error $? "--enable-sasl specified but SASL support is missing in your LDAP library" "$LINENO" 5 as_fn_error $? "--enable-sasl specified but SASL support is missing in your LDAP library" "$LINENO" 5
fi
fi fi
fi fi
fi for ac_header in ldapssl.h ldap_ssl.h mps/ldap_ssl.h
for ac_header in ldapssl.h ldap_ssl.h mps/ldap_ssl.h
do : do :
as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"` as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | sed "$as_sed_sh"`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <ldap.h> ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <ldap.h>
@ -30769,7 +30769,7 @@ _ACEOF
fi fi
done done
ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize" ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
if test "x$ac_cv_func_ldap_initialize" = xyes if test "x$ac_cv_func_ldap_initialize" = xyes
then : then :
printf "%s\n" "#define HAVE_LDAP_INITIALIZE 1" >>confdefs.h printf "%s\n" "#define HAVE_LDAP_INITIALIZE 1" >>confdefs.h
@ -30851,8 +30851,8 @@ fi
done done
if test X"$check_gss_krb5_ccache_name" = X"yes"; then if test X"$check_gss_krb5_ccache_name" = X"yes"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gss_krb5_ccache_name in -lgssapi" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gss_krb5_ccache_name in -lgssapi" >&5
printf %s "checking for gss_krb5_ccache_name in -lgssapi... " >&6; } printf %s "checking for gss_krb5_ccache_name in -lgssapi... " >&6; }
if test ${ac_cv_lib_gssapi_gss_krb5_ccache_name+y} if test ${ac_cv_lib_gssapi_gss_krb5_ccache_name+y}
then : then :
@ -30898,13 +30898,13 @@ printf "%s\n" "$ac_cv_lib_gssapi_gss_krb5_ccache_name" >&6; }
if test "x$ac_cv_lib_gssapi_gss_krb5_ccache_name" = xyes if test "x$ac_cv_lib_gssapi_gss_krb5_ccache_name" = xyes
then : then :
printf "%s\n" "#define HAVE_GSS_KRB5_CCACHE_NAME 1" >>confdefs.h printf "%s\n" "#define HAVE_GSS_KRB5_CCACHE_NAME 1" >>confdefs.h
LDAP_LIBS="${LDAP_LIBS} -lgssapi" LDAP_LIBS="${LDAP_LIBS} -lgssapi"
else case e in #( else case e in #(
e) e)
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gss_krb5_ccache_name in -lgssapi_krb5" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gss_krb5_ccache_name in -lgssapi_krb5" >&5
printf %s "checking for gss_krb5_ccache_name in -lgssapi_krb5... " >&6; } printf %s "checking for gss_krb5_ccache_name in -lgssapi_krb5... " >&6; }
if test ${ac_cv_lib_gssapi_krb5_gss_krb5_ccache_name+y} if test ${ac_cv_lib_gssapi_krb5_gss_krb5_ccache_name+y}
then : then :
@ -30950,28 +30950,28 @@ printf "%s\n" "$ac_cv_lib_gssapi_krb5_gss_krb5_ccache_name" >&6; }
if test "x$ac_cv_lib_gssapi_krb5_gss_krb5_ccache_name" = xyes if test "x$ac_cv_lib_gssapi_krb5_gss_krb5_ccache_name" = xyes
then : then :
printf "%s\n" "#define HAVE_GSS_KRB5_CCACHE_NAME 1" >>confdefs.h printf "%s\n" "#define HAVE_GSS_KRB5_CCACHE_NAME 1" >>confdefs.h
LDAP_LIBS="${LDAP_LIBS} -lgssapi_krb5" LDAP_LIBS="${LDAP_LIBS} -lgssapi_krb5"
fi fi
;; ;;
esac esac
fi fi
# gssapi headers may be separate or part of Kerberos V # gssapi headers may be separate or part of Kerberos V
found=no found=no
O_CPPFLAGS="$CPPFLAGS" O_CPPFLAGS="$CPPFLAGS"
for dir in "" "kerberosV" "krb5" "kerberos5" "kerberosv5"; do for dir in "" "kerberosV" "krb5" "kerberos5" "kerberosv5"; do
test X"$dir" != X"" && CPPFLAGS="$O_CPPFLAGS -I/usr/include/${dir}" test X"$dir" != X"" && CPPFLAGS="$O_CPPFLAGS -I/usr/include/${dir}"
# Use AC_PREPROC_IFELSE to check existence to avoid caching # Use AC_PREPROC_IFELSE to check existence to avoid caching
# since we test with multiple values of CPPFLAGS # since we test with multiple values of CPPFLAGS
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <gssapi/gssapi.h> #include <gssapi/gssapi.h>
int int
main (void) main (void)
{ {
@ -30984,21 +30984,21 @@ _ACEOF
if ac_fn_c_try_cpp "$LINENO" if ac_fn_c_try_cpp "$LINENO"
then : then :
ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi.h" "ac_cv_header_gssapi_gssapi_h" "$ac_includes_default"
if test "x$ac_cv_header_gssapi_gssapi_h" = xyes if test "x$ac_cv_header_gssapi_gssapi_h" = xyes
then : then :
printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_H 1" >>confdefs.h printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_H 1" >>confdefs.h
fi fi
break break
else case e in #( else case e in #(
e) e)
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <gssapi.h> #include <gssapi.h>
int int
main (void) main (void)
{ {
@ -31011,41 +31011,42 @@ _ACEOF
if ac_fn_c_try_cpp "$LINENO" if ac_fn_c_try_cpp "$LINENO"
then : then :
ac_fn_c_check_header_compile "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "gssapi.h" "ac_cv_header_gssapi_h" "$ac_includes_default"
if test "x$ac_cv_header_gssapi_h" = xyes if test "x$ac_cv_header_gssapi_h" = xyes
then : then :
printf "%s\n" "#define HAVE_GSSAPI_H 1" >>confdefs.h printf "%s\n" "#define HAVE_GSSAPI_H 1" >>confdefs.h
fi fi
break break
fi fi
rm -f conftest.err conftest.i conftest.$ac_ext rm -f conftest.err conftest.i conftest.$ac_ext
;; ;;
esac esac
fi fi
rm -f conftest.err conftest.i conftest.$ac_ext rm -f conftest.err conftest.i conftest.$ac_ext
done done
if test X"$ac_cv_header_gssapi_gssapi_h" != X"no"; then if test X"$ac_cv_header_gssapi_gssapi_h" != X"no"; then
ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi_krb5.h" "ac_cv_header_gssapi_gssapi_krb5_h" "$ac_includes_default" ac_fn_c_check_header_compile "$LINENO" "gssapi/gssapi_krb5.h" "ac_cv_header_gssapi_gssapi_krb5_h" "$ac_includes_default"
if test "x$ac_cv_header_gssapi_gssapi_krb5_h" = xyes if test "x$ac_cv_header_gssapi_gssapi_krb5_h" = xyes
then : then :
printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_KRB5_H 1" >>confdefs.h printf "%s\n" "#define HAVE_GSSAPI_GSSAPI_KRB5_H 1" >>confdefs.h
fi fi
elif test X"$ac_cv_header_gssapi_h" = X"no"; then elif test X"$ac_cv_header_gssapi_h" = X"no"; then
CPPFLAGS="$O_CPPFLAGS" CPPFLAGS="$O_CPPFLAGS"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unable to locate gssapi.h, you will have to edit the Makefile and add -I/path/to/gssapi/includes to CPPFLAGS" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unable to locate gssapi.h, you will have to edit the Makefile and add -I/path/to/gssapi/includes to CPPFLAGS" >&5
printf "%s\n" "$as_me: WARNING: unable to locate gssapi.h, you will have to edit the Makefile and add -I/path/to/gssapi/includes to CPPFLAGS" >&2;} printf "%s\n" "$as_me: WARNING: unable to locate gssapi.h, you will have to edit the Makefile and add -I/path/to/gssapi/includes to CPPFLAGS" >&2;}
fi
fi fi
SUDOERS_LIBS="${SUDOERS_LIBS} ${LDAP_LIBS}"
LIBS="$_LIBS"
LDFLAGS="$O_LDFLAGS"
fi fi
SUDOERS_LIBS="${SUDOERS_LIBS} ${LDAP_LIBS}"
LIBS="$_LIBS"
LDFLAGS="$O_LDFLAGS"
fi
# #
# How to do dynamic object loading. # How to do dynamic object loading.

124
configure.ac
View File

@ -4032,128 +4032,10 @@ else
fi fi
dnl dnl
dnl extra lib and .o file for LDAP support dnl If LDAP support is enabled, add sudo ldap objects to SUDOERS_OBJS
dnl and add LDAP libraries to SUDOERS_LDFLAGS SUDOERS_LIBS.
dnl dnl
if test ${with_ldap-'no'} != "no"; then SUDO_CHECK_LDAP
O_LDFLAGS="$LDFLAGS"
if test "$with_ldap" != "yes"; then
SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [${with_ldap}/lib])
LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
if test -d "${with_ldap}/lib64"; then
SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [${with_ldap}/lib64])
LDFLAGS="$LDFLAGS -L${with_ldap}/lib64"
fi
AX_APPEND_FLAG([-I${with_ldap}/include], [CPPFLAGS])
with_ldap=yes
fi
SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo ldap_conf.lo"
case "$SUDOERS_OBJS" in
*ldap_util.lo*) ;;
*) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";;
esac
LDAP=""
_LIBS="$LIBS"
LDAP_LIBS=""
IBMLDAP_EXTRA=""
found=no
# On HP-UX, libibmldap has a hidden dependency on libCsup
case "$host_os" in
hpux*) AC_CHECK_LIB([Csup], [main], [IBMLDAP_EXTRA=" -lCsup"]);;
esac
AC_SEARCH_LIBS([ldap_init], ["ibmldap${IBMLDAP_EXTRA}" "ibmldap -lidsldif${IBMLDAP_EXTRA}" "ldap" "ldap -llber" "ldap -llber -lssl -lcrypto" "ibmldap${IBMLDAP_EXTRA}]", [
test "${ac_cv_search_ldap_init}" != "none required" && LDAP_LIBS="${ac_cv_search_ldap_init}"
found=yes
])
# If nothing linked, try -lldap and hope for the best
if test "$found" = "no"; then
LDAP_LIBS="-lldap"
fi
LIBS="${_LIBS} ${LDAP_LIBS}"
dnl check if we need to link with -llber for ber_set_option
OLIBS="$LIBS"
AC_MSG_CHECKING([whether lber.h defines LBER_OPT_DEBUG_LEVEL])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
# include <lber.h>]], [[int opt=LBER_OPT_DEBUG_LEVEL;]])], [
AC_MSG_RESULT([yes])
AC_SEARCH_LIBS([ber_set_option], [lber], [found=yes], [found=no])
if test X"$found" = X"yes" -a X"$LIBS" != X"$OLIBS"; then
LDAP_LIBS="$LDAP_LIBS -llber"
fi
], [
AC_MSG_RESULT([no])
])
dnl check if ldap.h includes lber.h for us
AC_MSG_CHECKING([whether lber.h is needed])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
# include <ldap.h>]], [[(void)ldap_init(0, 0)]])], [AC_MSG_RESULT([no])], [
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_LBER_H)])
if test ${enable_sasl-'yes'} = "yes"; then
found_sasl_h=no
AC_CHECK_HEADERS([sasl/sasl.h] [sasl.h], [
found_sasl_h=yes
AC_CHECK_FUNCS([ldap_sasl_interactive_bind_s])
break
])
if test X${enable_sasl} = X"yes"; then
if test X"$found_sasl_h" != X"yes"; then
AC_MSG_ERROR([--enable-sasl specified but unable to locate SASL development headers.])
fi
if test X"$ac_cv_func_ldap_sasl_interactive_bind_s" != X"yes"; then :
AC_MSG_ERROR([--enable-sasl specified but SASL support is missing in your LDAP library])
fi
fi
fi
AC_CHECK_HEADERS([ldapssl.h] [ldap_ssl.h] [mps/ldap_ssl.h], [break], [], [#include <ldap.h>])
AC_CHECK_FUNCS([ldap_initialize ldap_start_tls_s ldapssl_init ldapssl_set_strength ldap_unbind_ext_s ldap_str2dn ldap_create ldap_sasl_bind_s ldap_ssl_init ldap_ssl_client_init ldap_start_tls_s_np])
AC_CHECK_FUNCS([ldap_search_ext_s ldap_search_st], [break])
if test X"$check_gss_krb5_ccache_name" = X"yes"; then
AC_CHECK_LIB([gssapi], [gss_krb5_ccache_name], [
AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME)
LDAP_LIBS="${LDAP_LIBS} -lgssapi"
], [
AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name, [
AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME)
LDAP_LIBS="${LDAP_LIBS} -lgssapi_krb5"
])
])
# gssapi headers may be separate or part of Kerberos V
found=no
O_CPPFLAGS="$CPPFLAGS"
for dir in "" "kerberosV" "krb5" "kerberos5" "kerberosv5"; do
test X"$dir" != X"" && CPPFLAGS="$O_CPPFLAGS -I/usr/include/${dir}"
# Use AC_PREPROC_IFELSE to check existence to avoid caching
# since we test with multiple values of CPPFLAGS
AC_PREPROC_IFELSE([
AC_LANG_PROGRAM([[#include <gssapi/gssapi.h>]])
], [
AC_CHECK_HEADERS([gssapi/gssapi.h])
break
], [
AC_PREPROC_IFELSE([
AC_LANG_PROGRAM([[#include <gssapi.h>]])
], [
AC_CHECK_HEADERS([gssapi.h])
break
])
])
done
if test X"$ac_cv_header_gssapi_gssapi_h" != X"no"; then
AC_CHECK_HEADERS([gssapi/gssapi_krb5.h])
elif test X"$ac_cv_header_gssapi_h" = X"no"; then
CPPFLAGS="$O_CPPFLAGS"
AC_MSG_WARN([unable to locate gssapi.h, you will have to edit the Makefile and add -I/path/to/gssapi/includes to CPPFLAGS])
fi
fi
SUDOERS_LIBS="${SUDOERS_LIBS} ${LDAP_LIBS}"
LIBS="$_LIBS"
LDFLAGS="$O_LDFLAGS"
fi
# #
# How to do dynamic object loading. # How to do dynamic object loading.

128
m4/ldap.m4 Normal file
View File

@ -0,0 +1,128 @@
AC_DEFUN([SUDO_CHECK_LDAP], [
if test ${with_ldap-'no'} != "no"; then
O_LDFLAGS="$LDFLAGS"
if test "$with_ldap" != "yes"; then
SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [${with_ldap}/lib])
LDFLAGS="$LDFLAGS -L${with_ldap}/lib"
if test -d "${with_ldap}/lib64"; then
SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [${with_ldap}/lib64])
LDFLAGS="$LDFLAGS -L${with_ldap}/lib64"
fi
AX_APPEND_FLAG([-I${with_ldap}/include], [CPPFLAGS])
with_ldap=yes
fi
SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo ldap_conf.lo"
case "$SUDOERS_OBJS" in
*ldap_util.lo*) ;;
*) SUDOERS_OBJS="${SUDOERS_OBJS} ldap_util.lo";;
esac
LDAP=""
_LIBS="$LIBS"
LDAP_LIBS=""
IBMLDAP_EXTRA=""
found=no
# On HP-UX, libibmldap has a hidden dependency on libCsup
case "$host_os" in
hpux*) AC_CHECK_LIB([Csup], [main], [IBMLDAP_EXTRA=" -lCsup"]);;
esac
AC_SEARCH_LIBS([ldap_init], ["ibmldap${IBMLDAP_EXTRA}" "ibmldap -lidsldif${IBMLDAP_EXTRA}" "ldap" "ldap -llber" "ldap -llber -lssl -lcrypto" "ibmldap${IBMLDAP_EXTRA}]", [
test "${ac_cv_search_ldap_init}" != "none required" && LDAP_LIBS="${ac_cv_search_ldap_init}"
found=yes
])
# If nothing linked, try -lldap and hope for the best
if test "$found" = "no"; then
LDAP_LIBS="-lldap"
fi
LIBS="${_LIBS} ${LDAP_LIBS}"
#
# Check if we need to link with -llber for ber_set_option()
#
OLIBS="$LIBS"
AC_CHECK_DECL([LBER_OPT_DEBUG_LEVEL], [
AC_SEARCH_LIBS([ber_set_option], [lber], [found=yes], [found=no])
if test X"$found" = X"yes" -a X"$LIBS" != X"$OLIBS"; then
LDAP_LIBS="$LDAP_LIBS -llber"
fi
], [], [AC_INCLUDES_DEFAULT
#include <lber.h>])
LIBS="$OLIBS"
AC_CACHE_CHECK([whether lber.h is needed when including ldap.h], [sudo_cv_header_lber_h], [
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <ldap.h>]], [[(void)ldap_init(0, 0)]])], [
# No need to explicitly include lber.h when including ldap.h.
sudo_cv_header_lber_h=no
], [
sudo_cv_header_lber_h=yes
])
])
if test X"$sudo_cv_header_lber_h" = X"yes"; then
AC_DEFINE(HAVE_LBER_H)
fi
if test ${enable_sasl-'yes'} = "yes"; then
found_sasl_h=no
AC_CHECK_HEADERS([sasl/sasl.h] [sasl.h], [
found_sasl_h=yes
AC_CHECK_FUNCS([ldap_sasl_interactive_bind_s])
break
])
if test X${enable_sasl} = X"yes"; then
if test X"$found_sasl_h" != X"yes"; then
AC_MSG_ERROR([--enable-sasl specified but unable to locate SASL development headers.])
fi
if test X"$ac_cv_func_ldap_sasl_interactive_bind_s" != X"yes"; then :
AC_MSG_ERROR([--enable-sasl specified but SASL support is missing in your LDAP library])
fi
fi
fi
AC_CHECK_HEADERS([ldapssl.h] [ldap_ssl.h] [mps/ldap_ssl.h], [break], [], [#include <ldap.h>])
AC_CHECK_FUNCS([ldap_initialize ldap_start_tls_s ldapssl_init ldapssl_set_strength ldap_unbind_ext_s ldap_str2dn ldap_create ldap_sasl_bind_s ldap_ssl_init ldap_ssl_client_init ldap_start_tls_s_np])
AC_CHECK_FUNCS([ldap_search_ext_s ldap_search_st], [break])
if test X"$check_gss_krb5_ccache_name" = X"yes"; then
AC_CHECK_LIB([gssapi], [gss_krb5_ccache_name], [
AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME)
LDAP_LIBS="${LDAP_LIBS} -lgssapi"
], [
AC_CHECK_LIB(gssapi_krb5, gss_krb5_ccache_name, [
AC_DEFINE(HAVE_GSS_KRB5_CCACHE_NAME)
LDAP_LIBS="${LDAP_LIBS} -lgssapi_krb5"
])
])
# gssapi headers may be separate or part of Kerberos V
found=no
O_CPPFLAGS="$CPPFLAGS"
for dir in "" "kerberosV" "krb5" "kerberos5" "kerberosv5"; do
test X"$dir" != X"" && CPPFLAGS="$O_CPPFLAGS -I/usr/include/${dir}"
# Use AC_PREPROC_IFELSE to check existence to avoid caching
# since we test with multiple values of CPPFLAGS
AC_PREPROC_IFELSE([
AC_LANG_PROGRAM([[#include <gssapi/gssapi.h>]])
], [
AC_CHECK_HEADERS([gssapi/gssapi.h])
break
], [
AC_PREPROC_IFELSE([
AC_LANG_PROGRAM([[#include <gssapi.h>]])
], [
AC_CHECK_HEADERS([gssapi.h])
break
])
])
done
if test X"$ac_cv_header_gssapi_gssapi_h" != X"no"; then
AC_CHECK_HEADERS([gssapi/gssapi_krb5.h])
elif test X"$ac_cv_header_gssapi_h" = X"no"; then
CPPFLAGS="$O_CPPFLAGS"
AC_MSG_WARN([unable to locate gssapi.h, you will have to edit the Makefile and add -I/path/to/gssapi/includes to CPPFLAGS])
fi
fi
SUDOERS_LIBS="${SUDOERS_LIBS} ${LDAP_LIBS}"
LIBS="$_LIBS"
LDFLAGS="$O_LDFLAGS"
fi
])