sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s4-libcli: Replace smb_composite_connect() with smb_full_connection()

Browse Source 
Python smb connection now uses smb_full_connection method.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Amitay Isaacs 2011-08-02 16:04:52 +10:00 committed by Andrew Bartlett
parent 6cce5fd43e
commit 38b8d38b30
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source4/libcli/pysmb.c
View File

@ -60,43 +60,39 @@ static void dos_format(char *s)
/*
* Connect to SMB share using smb_composite_connect
* Connect to SMB share using smb_full_connection
*/
static NTSTATUS do_smb_connect(TALLOC_CTX *mem_ctx, struct smb_private_data *spdata,
const char *hostname, const char *service, struct smbcli_tree **tree)
{
struct smb_composite_connect io;
struct smbcli_state *smb_state;
NTSTATUS status;
gensec_init();
struct smbcli_options options;
struct smbcli_session_options session_options;
*tree = NULL;
ZERO_STRUCT(io);
gensec_init();
io.in.dest_host = hostname;
smb_state = smbcli_state_init(mem_ctx);
io.in.dest_ports = lpcfg_smb_ports(spdata->lp_ctx);
io.in.socket_options = lpcfg_socket_options(spdata->lp_ctx);
io.in.gensec_settings = lpcfg_gensec_settings(mem_ctx, spdata->lp_ctx);
lpcfg_smbcli_options(spdata->lp_ctx, &options);
lpcfg_smbcli_session_options(spdata->lp_ctx, &session_options);
io.in.called_name = lpcfg_netbios_name(spdata->lp_ctx);
io.in.workgroup = lpcfg_workgroup(spdata->lp_ctx);
lpcfg_smbcli_options(spdata->lp_ctx, &io.in.options);
lpcfg_smbcli_session_options(spdata->lp_ctx, &io.in.session_options);
io.in.service = service;
io.in.service_type = NULL;
io.in.credentials = spdata->creds;
io.in.fallback_to_anonymous = false;
status = smb_composite_connect(&io, mem_ctx,
status = smbcli_full_connection(mem_ctx, &smb_state, hostname,
lpcfg_smb_ports(spdata->lp_ctx),
service,
NULL,
lpcfg_socket_options(spdata->lp_ctx),
spdata->creds,
lpcfg_resolve_context(spdata->lp_ctx),
spdata->ev_ctx);
spdata->ev_ctx,
&options,
&session_options,
lpcfg_gensec_settings(mem_ctx, spdata->lp_ctx));
if (NT_STATUS_IS_OK(status)) {
*tree = io.out.tree;
*tree = smb_state->tree;
}
return status;