diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-07-16 14:32:42 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-07-16 18:24:27 +1000 |
| commit | 6b266b85cf34145ac1f03d8f787b81121e4ec92b (patch) | |
| tree | 9f6faebdcf58c73e0297bfdf3b905ef256f8e478 /source4/torture/smb2 | |
| parent | e4c35c5a09dd66c9280caa39130b7e3b941b7e51 (diff) | |
| download | samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.gz samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.tar.bz2 samba-6b266b85cf34145ac1f03d8f787b81121e4ec92b.zip | |
s4-loadparm: 2nd half of lp_ to lpcfg_ conversion
this converts all callers that use the Samba4 loadparm lp_ calling
convention to use the lpcfg_ prefix.
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture/smb2')
| -rw-r--r-- | source4/torture/smb2/oplock.c | 10 | ||||
| -rw-r--r-- | source4/torture/smb2/scan.c | 18 | ||||
| -rw-r--r-- | source4/torture/smb2/util.c | 10 |
3 files changed, 19 insertions, 19 deletions
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index 12f16cb166..aa0b92dc80 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -284,15 +284,15 @@ static bool open_smb2_connection_no_level2_oplocks(struct torture_context *tctx, struct cli_credentials *credentials = cmdline_credentials; struct smbcli_options options; - lp_smbcli_options(tctx->lp_ctx, &options); + lpcfg_smbcli_options(tctx->lp_ctx, &options); options.use_level2_oplocks = false; status = smb2_connect(tctx, host, - lp_smb_ports(tctx->lp_ctx), share, - lp_resolve_context(tctx->lp_ctx), + lpcfg_smb_ports(tctx->lp_ctx), share, + lpcfg_resolve_context(tctx->lp_ctx), credentials, tree, tctx->ev, &options, - lp_socket_options(tctx->lp_ctx), - lp_gensec_settings(tctx, tctx->lp_ctx)); + lpcfg_socket_options(tctx->lp_ctx), + lpcfg_gensec_settings(tctx, tctx->lp_ctx)); if (!NT_STATUS_IS_OK(status)) { torture_comment(tctx, "Failed to connect to SMB2 share " "\\\\%s\\%s - %s\n", host, share, diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index a173c6debb..3b132ab8a4 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -201,15 +201,15 @@ bool torture_smb2_scan(struct torture_context *torture) struct smb2_request *req; struct smbcli_options options; - lp_smbcli_options(torture->lp_ctx, &options); + lpcfg_smbcli_options(torture->lp_ctx, &options); status = smb2_connect(mem_ctx, host, - lp_smb_ports(torture->lp_ctx), + lpcfg_smb_ports(torture->lp_ctx), share, - lp_resolve_context(torture->lp_ctx), + lpcfg_resolve_context(torture->lp_ctx), credentials, &tree, torture->ev, &options, - lp_socket_options(torture->lp_ctx), - lp_gensec_settings(torture, torture->lp_ctx)); + lpcfg_socket_options(torture->lp_ctx), + lpcfg_gensec_settings(torture, torture->lp_ctx)); if (!NT_STATUS_IS_OK(status)) { printf("Connection failed - %s\n", nt_errstr(status)); return false; @@ -224,12 +224,12 @@ bool torture_smb2_scan(struct torture_context *torture) if (!smb2_request_receive(req)) { talloc_free(tree); status = smb2_connect(mem_ctx, host, - lp_smb_ports(torture->lp_ctx), + lpcfg_smb_ports(torture->lp_ctx), share, - lp_resolve_context(torture->lp_ctx), + lpcfg_resolve_context(torture->lp_ctx), credentials, &tree, torture->ev, &options, - lp_socket_options(torture->lp_ctx), - lp_gensec_settings(mem_ctx, torture->lp_ctx)); + lpcfg_socket_options(torture->lp_ctx), + lpcfg_gensec_settings(mem_ctx, 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 1dc8fca2b0..96981125c2 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -270,16 +270,16 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr struct cli_credentials *credentials = cmdline_credentials; struct smbcli_options options; - lp_smbcli_options(tctx->lp_ctx, &options); + lpcfg_smbcli_options(tctx->lp_ctx, &options); status = smb2_connect(tctx, host, - lp_smb_ports(tctx->lp_ctx), + lpcfg_smb_ports(tctx->lp_ctx), share, - lp_resolve_context(tctx->lp_ctx), + lpcfg_resolve_context(tctx->lp_ctx), credentials, tree, tctx->ev, &options, - lp_socket_options(tctx->lp_ctx), - lp_gensec_settings(tctx, tctx->lp_ctx) + lpcfg_socket_options(tctx->lp_ctx), + lpcfg_gensec_settings(tctx, tctx->lp_ctx) ); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n", |