aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Nagel <wnagel@tycoint.com>2014-11-30 11:27:03 -0500
committerSteve Holme <steve_holme@hotmail.com>2014-11-30 21:32:44 +0000
commitb359badd491eba79289202a32a90ad04f84edc75 (patch)
tree5cf3ee17af7663be3657898f9b88871c8f76899a
parent6b8e5c0e8aafdc7872758a6798808a0295f08bbd (diff)
curl tool: Enable support for the SMB protocol
This patch enables SMB/CIFS support in the curl command-line tool.
-rw-r--r--src/tool_libinfo.c4
-rw-r--r--src/tool_paramhlp.c2
-rw-r--r--src/tool_setopt.c2
-rw-r--r--tests/data/DISABLED1
4 files changed, 7 insertions, 2 deletions
diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index 81b6680c8..a8ffb8f6d 100644
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, 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
@@ -67,6 +67,8 @@ CURLcode get_libcurl_info(void)
{ "rtsp", CURLPROTO_RTSP },
{ "scp", CURLPROTO_SCP },
{ "sftp", CURLPROTO_SFTP },
+ { "smb", CURLPROTO_SMB },
+ { "smbs", CURLPROTO_SMBS },
{ "smtp", CURLPROTO_SMTP },
{ "smtps", CURLPROTO_SMTPS },
{ "telnet", CURLPROTO_TELNET },
diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index 18da0265e..0e05184c3 100644
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -272,6 +272,8 @@ long proto2num(struct OperationConfig *config, long *val, const char *str)
{ "smtps", CURLPROTO_SMTPS },
{ "rtsp", CURLPROTO_RTSP },
{ "gopher", CURLPROTO_GOPHER },
+ { "smb", CURLPROTO_SMB },
+ { "smbs", CURLPROTO_SMBS },
{ NULL, 0 }
};
diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index 62d94a65f..a53fdc835 100644
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -134,6 +134,8 @@ const NameValue setopt_nv_CURLPROTO[] = {
NV(CURLPROTO_RTSP),
NV(CURLPROTO_SCP),
NV(CURLPROTO_SFTP),
+ NV(CURLPROTO_SMB),
+ NV(CURLPROTO_SMBS),
NV(CURLPROTO_SMTP),
NV(CURLPROTO_SMTPS),
NV(CURLPROTO_TELNET),
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 848de321b..6a0119db7 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -10,4 +10,3 @@
836
882
938
-1013