summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-08 15:41:24 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-09 12:40:09 +0200
commitacdf5b0d4c188c0ca9ac17caedd1b53ae241acd6 (patch)
tree0e9c321073617b347a4b9f54ff287b2b7b0ba4d5
parent2077e0f9032a84a1829012f11f968c32d78b7e0c (diff)
downloadsamba-acdf5b0d4c188c0ca9ac17caedd1b53ae241acd6.tar.gz
samba-acdf5b0d4c188c0ca9ac17caedd1b53ae241acd6.tar.bz2
samba-acdf5b0d4c188c0ca9ac17caedd1b53ae241acd6.zip
s3-libsmbclient Use workgroup from libsmbclient caller for domain in credentials
This previously set the workgroup, which is a different thing, but would have been the default if no domain was specified). This more clearly sets the information from the credentials file into the matching field in the credentials structure. Andrew Bartlett
-rw-r--r--source3/libsmb/libsmb_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index a7f236718a..9d473d19b2 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -750,6 +750,7 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
}
set_cmdline_auth_info_username(auth_info, user);
+ set_cmdline_auth_info_domain(auth_info, workgroup);
set_cmdline_auth_info_password(auth_info, password);
set_cmdline_auth_info_use_kerberos(auth_info, use_kerberos);
set_cmdline_auth_info_signing_state(auth_info, signing_state);
@@ -757,7 +758,6 @@ void smbc_set_credentials_with_fallback(SMBCCTX *context,
smbc_getOptionFallbackAfterKerberos(context));
set_cmdline_auth_info_use_ccache(
auth_info, smbc_getOptionUseCCache(context));
- set_global_myworkgroup(workgroup);
TALLOC_FREE(context->internal->auth_info);