Le 07/08/2017 à 18:37, Martin Ågren a écrit : > On 7 August 2017 at 16:04, Nicolas Morey-Chaisemartin > <nicolas@xxxxxxxxxxxxxxxxxxxxxx> wrote: >> Signed-off-by: Nicolas Morey-Chaisemartin <nicolas@xxxxxxxxxxxxxxxxxxxxxx> >> --- >> imap-send.c | 6 ------ >> 1 file changed, 6 deletions(-) >> >> diff --git a/imap-send.c b/imap-send.c >> index 90b8683ed..4ebc16437 100644 >> --- a/imap-send.c >> +++ b/imap-send.c >> @@ -35,13 +35,7 @@ typedef void *SSL; >> #include "http.h" >> #endif >> >> -#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL) >> -/* only available option */ >> #define USE_CURL_DEFAULT 1 >> -#else >> -/* strictly opt in */ >> -#define USE_CURL_DEFAULT 0 >> -#endif >> >> static int verbosity; >> static int use_curl = USE_CURL_DEFAULT; > So this is now basically "static int use_curl = 1;". > > Do we need a compile-time escape-hatch in case someone really needs > to avoid curl, e.g., because they have a too old version? I suppose > there is a conceptual difference between the "default", i.e., the value > of USE_CURL_DEFAULT that is assigned to "use_curl", and the "default > default", i.e., the value that is normally assigned to USE_CURL_DEFAULT. > > Martin The curl code depends on USE_CURL_FOR_IMAP_SEND so even with use_curl == 1, it won't be an issue for people without curl (or old one). I wasn't sure whether to drop the define or not and figure it might be worth keeping in case in change in the future for some reason. I don't mind dropping it and hardcofing the default to 1 Also on a side note, I have a case where authentication works with --no-curl but fails withs --curl. Still trying to figure out why. Nicolas
