Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TLMSP curl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CYBER - Cyber Security
TS 103 523 MSP
TLMSP
TLMSP curl
Commits
526603ff
Commit
526603ff
authored
10 years ago
by
Bill Nagel
Committed by
Steve Holme
10 years ago
Browse files
Options
Downloads
Patches
Plain Diff
smb: Build with SSPI enabled
Build SMB/CIFS protocol support when SSPI is enabled.
parent
eb88d778
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
configure.ac
+3
-2
3 additions, 2 deletions
configure.ac
lib/smb.c
+2
-3
2 additions, 3 deletions
lib/smb.c
lib/smb.h
+2
-3
2 additions, 3 deletions
lib/smb.h
lib/url.c
+1
-2
1 addition, 2 deletions
lib/url.c
lib/version.c
+1
-2
1 addition, 2 deletions
lib/version.c
with
9 additions
and
12 deletions
configure.ac
+
3
−
2
View file @
526603ff
...
...
@@ -3494,8 +3494,9 @@ if test "x$CURL_DISABLE_IMAP" != "x1"; then
fi
if test "x$CURL_DISABLE_SMB" != "x1" \
-a "x$CURL_DISABLE_CRYPTO_AUTH" != "x1" \
-a \( "x$USE_SSLEAY" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \
-o "x$NSS_ENABLED" = "x1" -o "x$DARWINSSL_ENABLED" = "x1" \); then
-a \( "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \
-o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1" \
-o "x$DARWINSSL_ENABLED" = "x1" \); then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMB"
if test "x$SSL_ENABLED" = "x1"; then
SUPPORT_PROTOCOLS="$SUPPORT_PROTOCOLS SMBS"
...
...
This diff is collapsed.
Click to expand it.
lib/smb.c
+
2
−
3
View file @
526603ff
...
...
@@ -22,8 +22,7 @@
#include
"curl_setup.h"
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
!defined(USE_WINDOWS_SSPI)
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
#define BUILDING_CURL_SMB_C
...
...
@@ -895,4 +894,4 @@ static CURLcode smb_parse_url_path(struct connectdata *conn)
return
CURLE_OK
;
}
#endif
/* CURL_DISABLE_SMB && USE_NTLM
&& USE_WINDOWS_SSPI
*/
#endif
/* CURL_DISABLE_SMB && USE_NTLM */
This diff is collapsed.
Click to expand it.
lib/smb.h
+
2
−
3
View file @
526603ff
...
...
@@ -256,12 +256,11 @@ struct smb_tree_disconnect {
#endif
/* BUILDING_CURL_SMB_C */
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
!defined(USE_WINDOWS_SSPI)
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
extern
const
struct
Curl_handler
Curl_handler_smb
;
extern
const
struct
Curl_handler
Curl_handler_smbs
;
#endif
/* CURL_DISABLE_SMB && USE_NTLM
&& USE_WINDOWS_SSPI
*/
#endif
/* CURL_DISABLE_SMB && USE_NTLM */
#endif
/* HEADER_CURL_SMB_H */
This diff is collapsed.
Click to expand it.
lib/url.c
+
1
−
2
View file @
526603ff
...
...
@@ -220,8 +220,7 @@ static const struct Curl_handler * const protocols[] = {
#endif
#endif
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
!defined(USE_WINDOWS_SSPI)
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
&
Curl_handler_smb
,
#ifdef USE_SSL
&
Curl_handler_smbs
,
...
...
This diff is collapsed.
Click to expand it.
lib/version.c
+
1
−
2
View file @
526603ff
...
...
@@ -216,8 +216,7 @@ static const char * const protocols[] = {
#ifdef USE_LIBSSH2
"sftp"
,
#endif
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM) && \
!defined(USE_WINDOWS_SSPI)
#if !defined(CURL_DISABLE_SMB) && defined(USE_NTLM)
"smb"
,
# ifdef USE_SSL
"smbs"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment