diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-03-28 23:12:23 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-03-29 14:43:54 +0200 |
| commit | 33ba0ecf482302b9906d9f6c4c1ab4fb2b2a3ef3 (patch) | |
| tree | c160846c8dc0ddb32e53a6491bf88bbba0acf54d | |
| parent | 2c26eeef12f0204fb85d6bf40b4e7a1e2ddcdf24 (diff) | |
| download | curl-33ba0ecf482302b9906d9f6c4c1ab4fb2b2a3ef3.tar.gz | |
define: remove CURL_DISABLE_NTLM ifdefsbagder/disable-scan-improvement
It was never defined anywhere. Fixed disable-scan (test 1165) to also
scan headers, which found this issue.
Closes #6809
| -rw-r--r-- | lib/config-vxworks.h | 3 | ||||
| -rw-r--r-- | lib/curl_setup.h | 2 | ||||
| -rw-r--r-- | packages/vms/generate_config_vms_h_curl.com | 6 | ||||
| -rwxr-xr-x | tests/disable-scan.pl | 4 |
4 files changed, 3 insertions, 12 deletions
diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h index eaeb01913..f81195285 100644 --- a/lib/config-vxworks.h +++ b/lib/config-vxworks.h @@ -56,9 +56,6 @@ /* to disable LDAPS */ #define CURL_DISABLE_LDAPS 1 -/* to disable NTLM authentication */ -#define CURL_DISABLE_NTLM 1 - /* to disable proxies */ /* #undef CURL_DISABLE_PROXY */ diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 30cc8d15e..cf1c26a14 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -641,7 +641,7 @@ int netware_init(void); #endif /* Single point where USE_NTLM definition might be defined */ -#if !defined(CURL_DISABLE_NTLM) && !defined(CURL_DISABLE_CRYPTO_AUTH) +#ifndef CURL_DISABLE_CRYPTO_AUTH #if defined(USE_OPENSSL) || defined(USE_MBEDTLS) || \ defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_SECTRANSP) || \ defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) || \ diff --git a/packages/vms/generate_config_vms_h_curl.com b/packages/vms/generate_config_vms_h_curl.com index 07d3fb089..fbcb4d0dd 100644 --- a/packages/vms/generate_config_vms_h_curl.com +++ b/packages/vms/generate_config_vms_h_curl.com @@ -278,15 +278,9 @@ $write cvh "#ifdef CURL_DISABLE_LIBCURL_OPTION" $write cvh "#undef CURL_DISABLE_LIBCURL_OPTION" $write cvh "#endif" $write cvh "#ifndef __VAX" -$write cvh "#ifdef CURL_DISABLE_NTLM" -$write cvh "#undef CURL_DISABLE_NTLM" -$write cvh "#endif" $write cvh "#else" $! NTLM needs long long or int64 support, missing from DECC C. $write cvh "#ifdef __DECC -$write cvh "#ifndef CURL_DISABLE_NTLM" -$write cvh "#define CURL_DISABLE_NTLM 1" -$write cvh "#endif" $write cvh "#endif" $write cvh "#endif" $write cvh "#ifdef CURL_DISABLE_POP3" diff --git a/tests/disable-scan.pl b/tests/disable-scan.pl index 16ffd1d8f..64a181aca 100755 --- a/tests/disable-scan.pl +++ b/tests/disable-scan.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2010 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 2010 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -62,7 +62,7 @@ sub scan_file { sub scan_dir { my ($dir)=@_; opendir(my $dh, $dir) || die "Can't opendir $dir: $!"; - my @cfiles = grep { /\.c\z/ && -f "$dir/$_" } readdir($dh); + my @cfiles = grep { /\.[ch]\z/ && -f "$dir/$_" } readdir($dh); closedir $dh; for my $f (sort @cfiles) { scan_file("$dir/$f"); |