Commit 4178fa9480b703cdbdc092d42b7dfdcbfa307ebf
1 parent
2675512c
Exists in
master
and in
3 other branches
Corrigindo opções de segurança.
Showing
2 changed files
with
46 additions
and
3 deletions
Show diff stats
configure.ac
... | ... | @@ -373,7 +373,7 @@ if test "$app_cv_inet_ntop" == "yes"; then |
373 | 373 | fi |
374 | 374 | |
375 | 375 | dnl --------------------------------------------------------------------------- |
376 | -dnl Check for Libraries | |
376 | +dnl Check for SSL | |
377 | 377 | dnl --------------------------------------------------------------------------- |
378 | 378 | |
379 | 379 | PKG_CHECK_MODULES( [LIBSSL], [libssl libcrypto], AC_DEFINE(HAVE_LIBSSL), AC_MSG_NOTICE([libssl not present.]) ) |
... | ... | @@ -382,6 +382,46 @@ AC_SUBST(LIBSSL_LIBS) |
382 | 382 | AC_SUBST(LIBSSL_CFLAGS) |
383 | 383 | |
384 | 384 | dnl --------------------------------------------------------------------------- |
385 | +dnl Check for LDAP | |
386 | +dnl --------------------------------------------------------------------------- | |
387 | + | |
388 | +AC_ARG_ENABLE([ldap], | |
389 | + AS_HELP_STRING([--disable-ldap],[Disable optional LDAP support]), | |
390 | + [case "${enableval}" in | |
391 | + yes) have_ldap=yes ;; | |
392 | + no) have_ldap=no ;; | |
393 | + *) AC_MSG_ERROR(bad value ${enableval} for --disable-ldap);; | |
394 | + esac], | |
395 | + [have_ldap=auto]) | |
396 | + | |
397 | + | |
398 | +if test "x${have_ldap}" != xno ; then | |
399 | + AC_CHECK_HEADERS( | |
400 | + [ldap.h], | |
401 | + [have_ldap=yes], | |
402 | + [if test "x$have_ldap" = xyes ; then | |
403 | + AC_MSG_ERROR([LDAP headers not found.]) | |
404 | + fi]) | |
405 | + | |
406 | + if test "x$have_ldap" = xyes ; then | |
407 | + | |
408 | + LDAP_LIBS="-lldap -llber" | |
409 | + AC_DEFINE(HAVE_LDAP,1,[LDAP is available]) | |
410 | + M4_DEFINES="$M4_DEFINES -DHAVE_LDAP" | |
411 | + | |
412 | + else | |
413 | + | |
414 | + have_ldap=no | |
415 | + | |
416 | + fi | |
417 | + | |
418 | +else | |
419 | + LDAP_LIBS= | |
420 | +fi | |
421 | + | |
422 | +AC_SUBST(LDAP_LIBS) | |
423 | + | |
424 | +dnl --------------------------------------------------------------------------- | |
385 | 425 | dnl Output config |
386 | 426 | dnl --------------------------------------------------------------------------- |
387 | 427 | ... | ... |
src/include/config.h.in
... | ... | @@ -45,12 +45,16 @@ |
45 | 45 | #undef HAVE_ICONV |
46 | 46 | #undef ICONV_CONST |
47 | 47 | |
48 | + /* Security options */ | |
49 | + #undef HAVE_LDAP | |
50 | + #undef HAVE_LIBSSL | |
48 | 51 | #undef SSL_ALLOW_SELF_SIGNED_CERT |
49 | 52 | #undef SSL_ENABLE_CRL_CHECK |
50 | 53 | |
54 | + /* Windows Options */ | |
51 | 55 | #ifdef WIN32 |
52 | 56 | #undef HAVE_WIN_REGISTRY |
53 | -#endif // HAVE_WIN_REGISTRY | |
57 | +#endif WIN32 | |
54 | 58 | |
55 | 59 | /* Optional parts. */ |
56 | 60 | #undef X3270_DBCS |
... | ... | @@ -65,7 +69,6 @@ |
65 | 69 | |
66 | 70 | #undef HAVE_PRINTER |
67 | 71 | #undef HAVE_MALLOC_H |
68 | - #undef HAVE_OOREXXAPI_H | |
69 | 72 | #undef HAVE_STRTOK_R |
70 | 73 | |
71 | 74 | #endif /* LIB3270_CONFIG_INCLUDED */ | ... | ... |