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/unix | |
| 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/unix')
| -rw-r--r-- | source4/torture/unix/unix_info2.c | 12 | ||||
| -rw-r--r-- | source4/torture/unix/whoami.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/source4/torture/unix/unix_info2.c b/source4/torture/unix/unix_info2.c index 32cc9ac487..4322d851e4 100644 --- a/source4/torture/unix/unix_info2.c +++ b/source4/torture/unix/unix_info2.c @@ -53,16 +53,16 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx) struct smbcli_options options; struct smbcli_session_options session_options; - lp_smbcli_options(tctx->lp_ctx, &options); - lp_smbcli_session_options(tctx->lp_ctx, &session_options); + lpcfg_smbcli_options(tctx->lp_ctx, &options); + lpcfg_smbcli_session_options(tctx->lp_ctx, &session_options); status = smbcli_full_connection(tctx, &cli, host, - lp_smb_ports(tctx->lp_ctx), - share, NULL, lp_socket_options(tctx->lp_ctx), + lpcfg_smb_ports(tctx->lp_ctx), + share, NULL, lpcfg_socket_options(tctx->lp_ctx), cmdline_credentials, - lp_resolve_context(tctx->lp_ctx), + lpcfg_resolve_context(tctx->lp_ctx), tctx->ev, &options, &session_options, - lp_gensec_settings(tctx, tctx->lp_ctx)); + lpcfg_gensec_settings(tctx, tctx->lp_ctx)); if (!NT_STATUS_IS_OK(status)) { printf("failed to connect to //%s/%s: %s\n", diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c index f87f13f248..45b2775646 100644 --- a/source4/torture/unix/whoami.c +++ b/source4/torture/unix/whoami.c @@ -77,15 +77,15 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx, struct smbcli_options options; struct smbcli_session_options session_options; - lp_smbcli_options(tctx->lp_ctx, &options); - lp_smbcli_session_options(tctx->lp_ctx, &session_options); + lpcfg_smbcli_options(tctx->lp_ctx, &options); + lpcfg_smbcli_session_options(tctx->lp_ctx, &session_options); status = smbcli_full_connection(tctx, &cli, host, - lp_smb_ports(tctx->lp_ctx), - share, NULL, lp_socket_options(tctx->lp_ctx), - creds, lp_resolve_context(tctx->lp_ctx), + lpcfg_smb_ports(tctx->lp_ctx), + share, NULL, lpcfg_socket_options(tctx->lp_ctx), + creds, lpcfg_resolve_context(tctx->lp_ctx), tctx->ev, &options, &session_options, - lp_gensec_settings(tctx, tctx->lp_ctx)); + lpcfg_gensec_settings(tctx, tctx->lp_ctx)); if (!NT_STATUS_IS_OK(status)) { printf("failed to connect to //%s/%s: %s\n", |