Merge branch 'rs/fsck-null-return-from-lookup'

diff --git a/imap-send.c b/imap-send.c
index dd203da8315e64bec8a27f3c0892b14661bc0f6b..8c785f3ca20c52266d7f99ca0d306a324756ede8 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -35,11 +35,11 @@ typedef void *SSL;
 #include "http.h"
 #endif
 
-#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL)
-/* only available option */
+#if defined(USE_CURL_FOR_IMAP_SEND)
+/* Always default to curl if it's available. */
 #define USE_CURL_DEFAULT 1
 #else
-/* strictly opt in */
+/* We don't have curl, so continue to use the historical implementation */
 #define USE_CURL_DEFAULT 0
 #endif