sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Explicitly pass on session options to session setup function.

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-09-30 01:38:51 +02:00
parent c8a19f0b83
commit 83183bf381
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source4/client/smbmount.c
View File

@ -111,7 +111,8 @@ static void usr1_handler(int x)
/*****************************************************
return a connection to a server
*******************************************************/
static struct smbcli_state *do_connection(const char *the_service, bool unicode, int maxprotocol)
static struct smbcli_state *do_connection(const char *the_service, bool unicode, int maxprotocol,
struct smbcli_session_options session_options)
{
struct smbcli_state *c;
struct nmb_name called, calling;
@ -210,11 +211,12 @@ static struct smbcli_state *do_connection(const char *the_service, bool unicode,
if (!smbcli_session_setup(c, username,
password, strlen(password),
password, strlen(password),
workgroup)) {
workgroup, session_options)) {
/* if a password was not supplied then try again with a
null username */
if (password[0] || !username[0] ||
!smbcli_session_setup(c, "", "", 0, "", 0, workgroup)) {
!smbcli_session_setup(c, "", "", 0, "", 0, workgroup,
session_options)) {
DEBUG(0,("%d: session setup failed: %s\n",
sys_getpid(), smbcli_errstr(c)));
talloc_free(c);
@ -329,6 +331,9 @@ static void send_fs_socket(struct loadparm_context *lp_ctx,
int fd, closed = 0, res = 1;
pid_t parentpid = getppid();
struct smb_conn_opt conn_options;
struct smbcli_session_options session_options;
lp_smbcli_session_options(lp_ctx, &session_options);
memset(&conn_options, 0, sizeof(conn_options));
@ -409,7 +414,8 @@ static void send_fs_socket(struct loadparm_context *lp_ctx,
DEBUG(2,("mount.smbfs[%d]: got signal, getting new socket\n", sys_getpid()));
c = do_connection(the_service,
lp_unicode(lp_ctx),
lp_cli_maxprotocol(lp_ctx));
lp_cli_maxprotocol(lp_ctx),
session_options);
}
}
@ -430,14 +436,17 @@ static void init_mount(struct loadparm_context *lp_ctx)
struct smbcli_state *c;
char *args[20];
int i, status;
struct smbcli_session_options session_options;
if (realpath(mpoint, mount_point) == NULL) {
fprintf(stderr, "Could not resolve mount point %s\n", mpoint);
return;
}
lp_smbcli_session_options(lp_ctx, &session_options);
c = do_connection(service, lp_unicode(lp_ctx), lp_cli_maxprotocol(lp_ctx));
c = do_connection(service, lp_unicode(lp_ctx), lp_cli_maxprotocol(lp_ctx),
session_options);
if (!c) {
fprintf(stderr,"SMB connection failed\n");
exit(1);

6
source4/libcli/cliconnect.c
View File

@ -69,13 +69,11 @@ NTSTATUS smbcli_negprot(struct smbcli_state *cli, bool unicode, int maxprotocol)
/* wrapper around smb_raw_sesssetup() */
NTSTATUS smbcli_session_setup(struct smbcli_state *cli,
struct cli_credentials *credentials,
const char *workgroup)
const char *workgroup,
struct smbcli_session_options options)
{
struct smb_composite_sesssetup setup;
NTSTATUS status;
struct smbcli_session_options options;
lp_smbcli_session_options(global_loadparm, &options);
cli->session = smbcli_session_init(cli->transport, cli, true,
options);