← Commit list

6393103b99

Daniel Stenberg
Daniel Stenberg
2026-03-22
SUCCESS Duration: 256s

Subject

lib: make SMB support opt-in

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

.github/workflows/windows.yml +2 -2CMakeLists.txt +4 -5configure.ac +9 -9docs/CURL-DISABLE.md +2 -2docs/DEPRECATE.md +1 -0docs/INSTALL-CMAKE.md +1 -1lib/curl_config-cmake.h.in +1 -1lib/curl_setup.h +0 -3lib/protocol.c +7 -7lib/smb.c +2 -2lib/smb.h +1 -1lib/version.c +1 -1
.github/workflows/windows.yml+2 -2
@@ -857,11 +857,11 @@ jobs:
image: 'windows-11-arm'
openssh: 'OpenSSH-Windows'
tflags: '--min=1650'
- # disable SMB to save 30-60 seconds by omitting prereqs, to counteract the slower test run step
+ # leave SMB disabled to save 30-60 seconds by omitting prereqs,
+ # to counteract the slower test run step
config: >-
-DENABLE_DEBUG=ON
-DCURL_USE_SCHANNEL=ON
- -DCURL_DISABLE_SMB=ON
-DUSE_WIN32_IDN=ON -DENABLE_UNICODE=ON -DUSE_SSLS_EXPORT=ON
fail-fast: false
CMakeLists.txt+4 -5
@@ -494,8 +494,8 @@ option(CURL_DISABLE_SHA512_256 "Disable SHA-512/256 hash algorithm" OFF)
mark_as_advanced(CURL_DISABLE_SHA512_256)
option(CURL_DISABLE_SHUFFLE_DNS "Disable shuffle DNS feature" OFF)
mark_as_advanced(CURL_DISABLE_SHUFFLE_DNS)
-option(CURL_DISABLE_SMB "Disable SMB" OFF)
-mark_as_advanced(CURL_DISABLE_SMB)
+option(CURL_ENABLE_SMB "Enable SMB" OFF)
+mark_as_advanced(CURL_ENABLE_SMB)
option(CURL_DISABLE_SMTP "Disable SMTP" OFF)
mark_as_advanced(CURL_DISABLE_SMTP)
option(CURL_DISABLE_SOCKETPAIR "Disable use of socketpair for curl_multi_poll()" OFF)
@@ -540,7 +540,6 @@ if(HTTP_ONLY)
set(CURL_DISABLE_MQTT ON)
set(CURL_DISABLE_POP3 ON)
set(CURL_DISABLE_RTSP ON)
- set(CURL_DISABLE_SMB ON)
set(CURL_DISABLE_SMTP ON)
set(CURL_DISABLE_TELNET ON)
set(CURL_DISABLE_TFTP ON)
@@ -1972,9 +1971,9 @@ curl_add_if("POP3" NOT CURL_DISABLE_POP3)
curl_add_if("POP3S" NOT CURL_DISABLE_POP3 AND _ssl_enabled)
curl_add_if("IMAP" NOT CURL_DISABLE_IMAP)
curl_add_if("IMAPS" NOT CURL_DISABLE_IMAP AND _ssl_enabled)
-curl_add_if("SMB" NOT CURL_DISABLE_SMB AND
+curl_add_if("SMB" CURL_ENABLE_SMB AND
_use_curl_ntlm_core AND (SIZEOF_CURL_OFF_T GREATER 4))
-curl_add_if("SMBS" NOT CURL_DISABLE_SMB AND _ssl_enabled AND
+curl_add_if("SMBS" CURL_ENABLE_SMB AND _ssl_enabled AND
_use_curl_ntlm_core AND (SIZEOF_CURL_OFF_T GREATER 4))
curl_add_if("SMTP" NOT CURL_DISABLE_SMTP)
curl_add_if("SMTPS" NOT CURL_DISABLE_SMTP AND _ssl_enabled)
configure.ac+9 -9
@@ -1018,19 +1018,19 @@ AS_HELP_STRING([--disable-imap],[Disable IMAP support]),
AC_MSG_CHECKING([whether to support smb])
AC_ARG_ENABLE(smb,
-AS_HELP_STRING([--enable-smb],[Enable SMB/CIFS support])
-AS_HELP_STRING([--disable-smb],[Disable SMB/CIFS support]),
+AS_HELP_STRING([--enable-smb],[Enable SMB support])
+AS_HELP_STRING([--disable-smb],[Disable SMB support]),
[ case "$enableval" in
- no)
- AC_MSG_RESULT(no)
- AC_DEFINE(CURL_DISABLE_SMB, 1, [to disable SMB/CIFS])
- CURL_DISABLE_SMB=1
+ yes)
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(CURL_ENABLE_SMB, 1, [to enable SMB])
+ CURL_ENABLE_SMB=1
;;
*)
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT(no)
;;
esac ],
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT(no)
)
AC_MSG_CHECKING([whether to support smtp])
@@ -5302,7 +5302,7 @@ if test "$CURL_DISABLE_IMAP" != "1"; then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS IMAPS"
fi
fi
-if test "$CURL_DISABLE_SMB" != "1" && test "$use_curl_ntlm_core" = "yes"; then
+if test "$CURL_ENABLE_SMB" = "1" && test "$use_curl_ntlm_core" = "yes"; then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB"
if test "$SSL_ENABLED" = "1"; then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMBS"
docs/CURL-DISABLE.md+2 -2
@@ -157,9 +157,9 @@ Disable the SHA-512/256 hash algorithm.
Disable the shuffle DNS feature
-## `CURL_DISABLE_SMB`
+## `CURL_ENABLE_SMB`
-Disable the SMB(S) protocols
+Enable the SMB(S) protocols
## `CURL_DISABLE_SMTP`
docs/DEPRECATE.md+1 -0
@@ -27,6 +27,7 @@ TLS-SRP support gets removed in August 2026.
## SMB goes opt-in
The SMB protocol has weak security and is rarely used these days. After curl
+
8.19.0 SMB support becomes opt-in.
## NTLM goes opt-in
docs/INSTALL-CMAKE.md+1 -1
@@ -310,7 +310,7 @@ target_link_libraries(my_target PRIVATE CURL::libcurl)
- `CURL_DISABLE_RTSP`: Disable RTSP. Default: `OFF`
- `CURL_DISABLE_SHA512_256`: Disable SHA-512/256 hash algorithm. Default: `OFF`
- `CURL_DISABLE_SHUFFLE_DNS`: Disable shuffle DNS feature. Default: `OFF`
-- `CURL_DISABLE_SMB`: Disable SMB. Default: `OFF`
+- `CURL_ENABLE_SMB`: Enable SMB. Default: `OFF`
- `CURL_DISABLE_SMTP`: Disable SMTP. Default: `OFF`
- `CURL_DISABLE_SOCKETPAIR`: Disable use of socketpair for curl_multi_poll(). Default: `OFF`
- `CURL_DISABLE_SRP`: Disable TLS-SRP support. Default: `OFF`
lib/curl_config-cmake.h.in+1 -1
@@ -146,7 +146,7 @@
#cmakedefine CURL_DISABLE_SHUFFLE_DNS 1
/* disables SMB */
-#cmakedefine CURL_DISABLE_SMB 1
+#cmakedefine CURL_ENABLE_SMB 1
/* disables SMTP */
#cmakedefine CURL_DISABLE_SMTP 1
lib/curl_setup.h+0 -3
@@ -258,9 +258,6 @@
# ifndef CURL_DISABLE_RTSP
# define CURL_DISABLE_RTSP
# endif
-# ifndef CURL_DISABLE_SMB
-# define CURL_DISABLE_SMB
-# endif
# ifndef CURL_DISABLE_SMTP
# define CURL_DISABLE_SMTP
# endif
lib/protocol.c+7 -7
@@ -309,10 +309,10 @@ const struct Curl_scheme Curl_scheme_scp = {
const struct Curl_scheme Curl_scheme_smb = {
"smb", /* scheme */
-#if defined(CURL_DISABLE_SMB) || !defined(USE_CURL_NTLM_CORE)
- ZERO_NULL,
-#else
+#if defined(CURL_ENABLE_SMB) && defined(USE_CURL_NTLM_CORE)
&Curl_protocol_smb,
+#else
+ ZERO_NULL,
#endif
CURLPROTO_SMB, /* protocol */
CURLPROTO_SMB, /* family */
@@ -322,11 +322,11 @@ const struct Curl_scheme Curl_scheme_smb = {
const struct Curl_scheme Curl_scheme_smbs = {
"smbs", /* scheme */
-#if defined(CURL_DISABLE_SMB) || !defined(USE_CURL_NTLM_CORE) || \
- !defined(USE_SSL)
- ZERO_NULL,
-#else
+#if defined(CURL_ENABLE_SMB) && defined(USE_CURL_NTLM_CORE) && \
+ defined(USE_SSL)
&Curl_protocol_smb,
+#else
+ ZERO_NULL,
#endif
CURLPROTO_SMBS, /* protocol */
CURLPROTO_SMB, /* family */
lib/smb.c+2 -2
@@ -25,7 +25,7 @@
#include "curl_setup.h"
#include "urldata.h"
-#if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE)
+#if defined(CURL_ENABLE_SMB) && defined(USE_CURL_NTLM_CORE)
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h> /* for htons() */
@@ -1228,4 +1228,4 @@ const struct Curl_protocol Curl_protocol_smb = {
ZERO_NULL, /* follow */
};
-#endif /* CURL_DISABLE_SMB && USE_CURL_NTLM_CORE && SIZEOF_CURL_OFF_T > 4 */
+#endif /* CURL_ENABLE_SMB && USE_CURL_NTLM_CORE && SIZEOF_CURL_OFF_T > 4 */
lib/smb.h+1 -1
@@ -24,7 +24,7 @@
* SPDX-License-Identifier: curl
*
***************************************************************************/
-#if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE)
+#if defined(CURL_ENABLE_SMB) && defined(USE_CURL_NTLM_CORE)
extern const struct Curl_protocol Curl_protocol_smb;
#endif
lib/version.c+1 -1
@@ -345,7 +345,7 @@ static const char * const supported_protocols[] = {
"scp",
"sftp",
#endif
-#if !defined(CURL_DISABLE_SMB) && defined(USE_CURL_NTLM_CORE)
+#if defined(CURL_ENABLE_SMB) && defined(USE_CURL_NTLM_CORE)
"smb",
# ifdef USE_SSL
"smbs",