-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Re-add CURL_DISABLE_NTLM #7028
Re-add CURL_DISABLE_NTLM #7028
Conversation
lib/curl_setup.h
Outdated
@@ -641,7 +641,7 @@ int netware_init(void); | |||
#endif | |||
|
|||
/* Single point where USE_NTLM definition might be defined */ | |||
#ifndef CURL_DISABLE_CRYPTO_AUTH | |||
#if !defined(CURL_DISABLE_NTLM) && !defined(CURL_DISABLE_CRYPTO_AUTH) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably also apply for the USE_NTLM
below. So for SSPI, we wouldn't want NTLM either with CURL_DISABLE_NTLM
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The scope of this if ends at line 662 so USE_NTLM will be disabled even when USE_WINDOWS_SSPI is enabled.
I can try to improve the readability here by adding new lines here and there.
Thanks, your comment led me to the bug in CMake build in this patch which has the exact same issue.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, looks good to me! We have to wait until the feature window opens again though as we're in the bugfix-only period.
Thanks! |
This pull request is meant to re-add
CURL_DISABLE_NTLM
flag and corresponding ifdefs.It more or less reverts the pull request: #6809.
Conversation on IRC:
The flag was originally removed because it was not getting set anywhere.
As per the conversation on IRC, I have tried to add build options exposing the flag in both CMake and autotools build.
These changes will allow the users to build curl from source with CRYPTO_AUTH support but without NTLM support.
I have performed basic sanity testing but do let me know if anything more is required.
Output from
make checksrc
Output from
./configure --help
Output from
./configure --with-secure-transport
Output from
./configure --with-secure-transport --disable-ntlm
Output from
cmake -DCURL_DISABLE_NTLM=ON .
Output from
cmake -DCURL_DISABLE_NTLM=OFF .