From e80d9d5902f38407d971587f2a6b7b839247ca92 Mon Sep 17 00:00:00 2001 From: Bill Nagel Date: Sat, 29 Nov 2014 13:12:44 -0500 Subject: [PATCH] smb: Added initial source files for SMB Added the initial source files and updated the relevant project files in order to support SMB/CIFS. --- lib/Makefile.inc | 4 ++-- lib/Makefile.vc6 | 1 + lib/smb.c | 33 ++++++++++++++++++++++++++++++ lib/smb.h | 25 ++++++++++++++++++++++ packages/Symbian/group/libcurl.mmp | 2 +- 5 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 lib/smb.c create mode 100644 lib/smb.h diff --git a/lib/Makefile.inc b/lib/Makefile.inc index cfbd3c7dd6..8e55038d01 100644 --- a/lib/Makefile.inc +++ b/lib/Makefile.inc @@ -45,7 +45,7 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c \ curl_ntlm_core.c curl_ntlm_msgs.c curl_sasl.c curl_multibyte.c \ hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c \ - http2.c curl_sasl_sspi.c + http2.c curl_sasl_sspi.c smb.c LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h if2ip.h \ @@ -63,7 +63,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \ curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h \ curl_ntlm_msgs.h curl_sasl.h curl_multibyte.h hostcheck.h bundles.h \ conncache.h curl_setup_once.h multihandle.h setup-vms.h pipeline.h \ - dotdot.h x509asn1.h http2.h sigpipe.h + dotdot.h x509asn1.h http2.h sigpipe.h smb.h LIB_RCFILES = libcurl.rc diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6 index adf4a4cf24..d2e4345340 100644 --- a/lib/Makefile.vc6 +++ b/lib/Makefile.vc6 @@ -610,6 +610,7 @@ X_OBJS= \ $(DIROBJ)\sendf.obj \ $(DIROBJ)\share.obj \ $(DIROBJ)\slist.obj \ + $(DIROBJ)\smb.obj \ $(DIROBJ)\smtp.obj \ $(DIROBJ)\socks.obj \ $(DIROBJ)\socks_gssapi.obj \ diff --git a/lib/smb.c b/lib/smb.c new file mode 100644 index 0000000000..d0bf36bb16 --- /dev/null +++ b/lib/smb.c @@ -0,0 +1,33 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 2014, Bill Nagel , Exacq Technologies + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#include "curl_setup.h" + +#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \ + !defined(USE_WINDOWS_SSPI) + +#include "smb.h" + +/* The last #include file should be: */ +#include "memdebug.h" + +#endif /* CURL_DISABLE_SMB && USE_NTLM && USE_WINDOWS_SSPI */ diff --git a/lib/smb.h b/lib/smb.h new file mode 100644 index 0000000000..f4f111f08f --- /dev/null +++ b/lib/smb.h @@ -0,0 +1,25 @@ +#ifndef HEADER_CURL_SMB_H +#define HEADER_CURL_SMB_H +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 2014, Bill Nagel , Exacq Technologies + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +#endif /* HEADER_CURL_SMB_H */ diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp index c7db9cf06a..086f648185 100644 --- a/packages/Symbian/group/libcurl.mmp +++ b/packages/Symbian/group/libcurl.mmp @@ -39,7 +39,7 @@ SOURCE \ http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c \ curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c \ curl_sasl.c vtls/curl_schannel.c curl_multibyte.c \ - vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c + vtls/curl_darwinssl.c bundles.c conncache.c curl_sasl_sspi.c smb.c USERINCLUDE ../../../lib ../../../include/curl #ifdef ENABLE_SSL