Allow disabling of NTLM
Hrvoje Niksic <[email protected]>
| Newsgroups | gmane.comp.web.wget.patches |
|---|---|
| Message-ID | <[email protected]> |
This patch allows the user to completely disable the NTLM authorization code. (Some people use this to reduce the code size; Wget has traditionally supported disabling the Digest and Opie code, so there is no reason for NTLM to be any different.) More importantly, it allows us to disable NTLM with a single stroke should it prove unsuitable for the 1.10 release. 2005-04-06 Hrvoje Niksic <[email protected]> * configure.in: Allow the user to disable NTLM authorization. Make sure NTLM is disabled if OpenSSL is unavailable. If NTLM is *explicitly* requested and OpenSSL is unavailable, abort. * configure.in: Renamed USE_* to ENABLE_*. Index: configure.in =================================================================== RCS file: /pack/anoncvs/wget/configure.in,v retrieving revision 1.75 diff -u -r1.75 configure.in --- configure.in 2005/03/04 19:20:59 1.75 +++ configure.in 2005/04/06 17:53:32 @@ -58,16 +58,20 @@ AC_ARG_ENABLE(opie, [ --disable-opie disable support for opie or s/key FTP login], -USE_OPIE=$enableval, USE_OPIE=yes) -test x"${USE_OPIE}" = xyes && AC_DEFINE([USE_OPIE], 1, +ENABLE_OPIE=$enableval, ENABLE_OPIE=yes) +test x"${ENABLE_OPIE}" = xyes && AC_DEFINE([ENABLE_OPIE], 1, [Define if you want the Opie support for FTP compiled in.]) AC_ARG_ENABLE(digest, [ --disable-digest disable support for HTTP digest authorization], -USE_DIGEST=$enableval, USE_DIGEST=yes) -test x"${USE_DIGEST}" = xyes && AC_DEFINE([USE_DIGEST], 1, +ENABLE_DIGEST=$enableval, ENABLE_DIGEST=yes) +test x"${ENABLE_DIGEST}" = xyes && AC_DEFINE([ENABLE_DIGEST], 1, [Define if you want the HTTP Digest Authorization compiled in.]) +AC_ARG_ENABLE(ntlm, +[ --disable-ntlm disable support for NTLM authorization], +[ENABLE_NTLM=$enableval], [ENABLE_NTLM=auto]) + AC_ARG_ENABLE(debug, [ --disable-debug disable support for debugging output], ENABLE_DEBUG=$enableval, ENABLE_DEBUG=yes) @@ -76,11 +80,11 @@ wget_need_md5=no -case "${USE_OPIE}${USE_DIGEST}" in +case "${ENABLE_OPIE}${ENABLE_DIGEST}" in *yes*) wget_need_md5=yes esac -if test x"$USE_OPIE" = xyes; then +if test x"$ENABLE_OPIE" = xyes; then OPIE_OBJ='ftp-opie$o' fi AC_SUBST(OPIE_OBJ) @@ -412,6 +416,26 @@ dnl @SSL_INCLUDES@. CPPFLAGS=$wget_save_CPPFLAGS fi + +dnl Enable NTLM if requested and if SSL is available. +NTLM_OBJ='' +if test x"$ssl_success" = xyes +then + if test x"$ENABLE_NTLM" != xno + then + AC_DEFINE([ENABLE_NTLM], 1, + [Define if you want the NTLM authorization support compiled in.]) + NTLM_OBJ='http-ntlm$o' + fi +else + dnl If SSL is unavailable and the user explicitly requested NTLM, + dnl abort. + if test x"$ENABLE_NTLM" = xyes + then + AC_MSG_ERROR([NTLM authorization requested and OpenSSL not found; aborting]) + fi +fi +AC_SUBST(NTLM_OBJ) dnl dnl Find an md5 implementation.