diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 23:26:36 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 23:26:36 +0100 |
| commit | d9cbf2b0d9fdd1373ea0a0d021df3230637e21ac (patch) | |
| tree | 0e8efd7342b31ce79d7ea0fb0eb5681907a13fe2 /source4/torture | |
| parent | 79423337125978f5b5eef341283ff2a9c891fc5c (diff) | |
| download | samba-d9cbf2b0d9fdd1373ea0a0d021df3230637e21ac.tar.gz samba-d9cbf2b0d9fdd1373ea0a0d021df3230637e21ac.tar.bz2 samba-d9cbf2b0d9fdd1373ea0a0d021df3230637e21ac.zip | |
Remove another use of global_loadparm.
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/gentest.c | 4 | ||||
| -rw-r--r-- | source4/torture/smb2/scan.c | 4 | ||||
| -rw-r--r-- | source4/torture/smb2/util.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index aefed23f51..eb948f64b1 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -231,7 +231,9 @@ static bool connect_servers(struct event_context *ev, lp_resolve_context(lp_ctx), servers[i].credentials, &servers[i].smb2_tree[j], - ev, &smb_options); + ev, &smb_options, + lp_socket_options(lp_ctx) + ); } else { status = smbcli_tree_full_connection(NULL, &servers[i].smb_tree[j], diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index ae51af1882..5f1514df83 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -224,7 +224,9 @@ bool torture_smb2_scan(struct torture_context *torture) status = smb2_connect(mem_ctx, host, share, lp_resolve_context(torture->lp_ctx), credentials, &tree, - torture->ev, &options); + torture->ev, &options, + lp_socket_options(torture->lp_ctx) + ); if (!NT_STATUS_IS_OK(status)) { printf("Connection failed - %s\n", nt_errstr(status)); return false; diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 3a437acbab..193b43266c 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -277,7 +277,9 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr status = smb2_connect(tctx, host, share, lp_resolve_context(tctx->lp_ctx), credentials, tree, - tctx->ev, &options); + tctx->ev, &options, + lp_socket_options(tctx->lp_ctx) + ); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n", host, share, nt_errstr(status)); |