define: remove CURL_DISABLE_NTLM ifdefs

It was never defined anywhere. Fixed disable-scan (test 1165) to also
scan headers, which found this issue.

Closes #6809

diff --git a/lib/config-vxworks.h b/lib/config-vxworks.h
index eaeb019134556d257d156388f2a1a65f196a32f8..f8119528537a56f245e8e4eb3564fc55b029411e 100644 (file)
--- 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 30cc8d15e636e058ae1abd2af43c3e6a389036e9..cf1c26a14e398dc9175c5b8bfd77b990bafdc2d4 100644 (file)
--- 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 07d3fb0890429c863fcae98475edc710ba9e1233..fbcb4d0dd0aeeee133c4e5fb9304b02bfbe6733b 100644 (file)
--- 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 16ffd1d8f937b89dfd0cc2741b813a3038ca212b..64a181aca18eb401e0be608302ba1dbf9471c43b 100755 (executable)
--- 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");