From 4178fa9480b703cdbdc092d42b7dfdcbfa307ebf Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Fri, 9 Nov 2018 12:37:05 -0200 Subject: [PATCH] Corrigindo opções de segurança. --- configure.ac | 42 +++++++++++++++++++++++++++++++++++++++++- src/include/config.h.in | 7 +++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index dbb2058..963950e 100644 --- a/configure.ac +++ b/configure.ac @@ -373,7 +373,7 @@ if test "$app_cv_inet_ntop" == "yes"; then fi dnl --------------------------------------------------------------------------- -dnl Check for Libraries +dnl Check for SSL dnl --------------------------------------------------------------------------- PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) @@ -382,6 +382,46 @@ AC_SUBST(LIBSSL_LIBS) AC_SUBST(LIBSSL_CFLAGS) dnl --------------------------------------------------------------------------- +dnl Check for LDAP +dnl --------------------------------------------------------------------------- + +AC_ARG_ENABLE([ldap], + AS_HELP_STRING([--disable-ldap],[Disable optional LDAP support]), + [case "${enableval}" in + yes) have_ldap=yes ;; + no) have_ldap=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-ldap);; + esac], + [have_ldap=auto]) + + +if test "x${have_ldap}" != xno ; then + AC_CHECK_HEADERS( + [ldap.h], + [have_ldap=yes], + [if test "x$have_ldap" = xyes ; then + AC_MSG_ERROR([LDAP headers not found.]) + fi]) + + if test "x$have_ldap" = xyes ; then + + LDAP_LIBS="-lldap -llber" + AC_DEFINE(HAVE_LDAP,1,[LDAP is available]) + M4_DEFINES="$M4_DEFINES -DHAVE_LDAP" + + else + + have_ldap=no + + fi + +else + LDAP_LIBS= +fi + +AC_SUBST(LDAP_LIBS) + +dnl --------------------------------------------------------------------------- dnl Output config dnl --------------------------------------------------------------------------- diff --git a/src/include/config.h.in b/src/include/config.h.in index 360930f..ff99173 100644 --- a/src/include/config.h.in +++ b/src/include/config.h.in @@ -45,12 +45,16 @@ #undef HAVE_ICONV #undef ICONV_CONST + /* Security options */ + #undef HAVE_LDAP + #undef HAVE_LIBSSL #undef SSL_ALLOW_SELF_SIGNED_CERT #undef SSL_ENABLE_CRL_CHECK + /* Windows Options */ #ifdef WIN32 #undef HAVE_WIN_REGISTRY -#endif // HAVE_WIN_REGISTRY +#endif WIN32 /* Optional parts. */ #undef X3270_DBCS @@ -65,7 +69,6 @@ #undef HAVE_PRINTER #undef HAVE_MALLOC_H - #undef HAVE_OOREXXAPI_H #undef HAVE_STRTOK_R #endif /* LIB3270_CONFIG_INCLUDED */ -- libgit2 0.21.2