From b4f6319cf77ca2642154bdac76d6729dde56dd8e Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sat, 27 Aug 2011 01:32:49 +0200 Subject: NTLM single-sign on adjustments (XI) Feature string literal NTLM_SSO renamed to NTLM_WB. Preprocessor symbol USE_NTLM_SSO renamed to WINBIND_NTLM_AUTH_ENABLED. curl's 'long' option 'ntlm-sso' renamed to 'ntlm-wb'. Fix some comments to make clear that this is actually a NTLM delegation. --- m4/curl-confopts.m4 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'm4/curl-confopts.m4') diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 index 015101e7f..190ff00a7 100644 --- a/m4/curl-confopts.m4 +++ b/m4/curl-confopts.m4 @@ -508,8 +508,8 @@ AC_DEFUN([CURL_CHECK_OPTION_WINBIND_NTLM_AUTH], [ AC_BEFORE([$0],[CURL_CHECK_WINBIND_NTLM_AUTH])dnl OPT_WINBIND_NTLM_AUTH="default" AC_ARG_ENABLE(wb-ntlm-auth, -AC_HELP_STRING([--enable-wb-ntlm-auth@<:@=FILE@:>@],[Enable winbind's ntlm_auth helper for NTLM SSO, where FILE is ntlm_auth's absolute filename (default: /usr/bin/ntlm_auth)]) -AC_HELP_STRING([--disable-wb-ntlm-auth],[Disable winbind's ntlm_auth helper for NTLM SSO]), +AC_HELP_STRING([--enable-wb-ntlm-auth@<:@=FILE@:>@],[Enable NTLM delegation to winbind's ntlm_auth helper, where FILE is ntlm_auth's absolute filename (default: /usr/bin/ntlm_auth)]) +AC_HELP_STRING([--disable-wb-ntlm-auth],[Disable NTLM delegation to winbind's ntlm_auth helper]), OPT_WINBIND_NTLM_AUTH=$enableval) want_wb_ntlm_auth_file="/usr/bin/ntlm_auth" case "$OPT_WINBIND_NTLM_AUTH" in @@ -541,15 +541,16 @@ dnl given and target platform. AC_DEFUN([CURL_CHECK_WINBIND_NTLM_AUTH], [ AC_REQUIRE([CURL_CHECK_OPTION_WINBIND_NTLM_AUTH])dnl AC_REQUIRE([CURL_CHECK_NATIVE_WINDOWS])dnl - AC_MSG_CHECKING([whether to enable winbind's ntlm_auth support for NTLM SSO]) - if test "$ac_cv_native_windows" = "yes"; then + AC_MSG_CHECKING([whether to enable NTLM delegation to winbind's helper]) + if test "$ac_cv_native_windows" = "yes" || + test "x$SSL_ENABLED" = "x"; then want_wb_ntlm_auth_file="" want_wb_ntlm_auth="no" fi AC_MSG_RESULT([$want_wb_ntlm_auth]) if test "$want_wb_ntlm_auth" = "yes"; then AC_DEFINE(WINBIND_NTLM_AUTH_ENABLED, 1, - [Define to enable winbind's ntlm_auth support for NTLM SSO.]) + [Define to enable NTLM delegation to winbind's ntlm_auth helper.]) AC_DEFINE_UNQUOTED(WINBIND_NTLM_AUTH_FILE, "$want_wb_ntlm_auth_file", [Define absolute filename for winbind's ntlm_auth helper.]) WINBIND_NTLM_AUTH_ENABLED=1 -- cgit v1.2.3