From: Stefan Metzmacher Date: Thu, 10 Apr 2025 14:48:48 +0000 (+0200) Subject: s4:libcli: pass struct loadparm_context to smb2_connect() X-Git-Tag: tevent-0.17.0~249 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=092d32032bb1df0b368631cfaab6c066f4fa9f2a;p=thirdparty%2Fsamba.git s4:libcli: pass struct loadparm_context to smb2_connect() Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke --- diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c index f1a9164f9f3..f800a560236 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -451,6 +451,7 @@ NTSTATUS smb2_connect_ext(TALLOC_CTX *mem_ctx, NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx, const char *host, const char *share, + struct loadparm_context *lp_ctx, struct resolve_context *resolve_ctx, struct cli_credentials *credentials, struct smb2_tree **tree, diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index d9f6dfac97b..610403c2cd4 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -231,6 +231,7 @@ static bool connect_servers(struct tevent_context *ev, if (options.smb2) { status = smb2_connect(NULL, servers[i].server_name, servers[i].share_name, + lp_ctx, lpcfg_resolve_context(lp_ctx), servers[i].credentials, &servers[i].smb2_tree[j], diff --git a/source4/torture/rpc/fsrvp.c b/source4/torture/rpc/fsrvp.c index e6f7fddfdae..d276eb1522f 100644 --- a/source4/torture/rpc/fsrvp.c +++ b/source4/torture/rpc/fsrvp.c @@ -554,6 +554,7 @@ static bool test_fsrvp_sc_share_io(struct torture_context *tctx, status = smb2_connect(tmp_ctx, dcerpc_server_name(p), FSHARE, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree_base, @@ -584,6 +585,7 @@ static bool test_fsrvp_sc_share_io(struct torture_context *tctx, status = smb2_connect(tmp_ctx, dcerpc_server_name(p), sc_map->ShadowCopyShareName, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree_snap, @@ -676,6 +678,7 @@ static bool test_fsrvp_enum_created(struct torture_context *tctx, status = smb2_connect(tmp_ctx, dcerpc_server_name(p), FSHARE, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree_base, diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 72f2b1f6252..ae8b202252b 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -3715,6 +3715,7 @@ static bool torture_rpc_smb2_reauth1(struct torture_context *torture) status = smb2_connect(mem_ctx, host, "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, @@ -3864,6 +3865,7 @@ static bool torture_rpc_smb2_reauth2(struct torture_context *torture) status = smb2_connect(mem_ctx, host, "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, @@ -4229,6 +4231,7 @@ static bool torture_rpc_smb2_pipe_name(struct torture_context *torture) status = smb2_connect(mem_ctx, host, "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, @@ -4322,6 +4325,7 @@ static bool torture_rpc_smb2_pipe_read_close(struct torture_context *torture) status = smb2_connect(mem_ctx, host, "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, @@ -4405,6 +4409,7 @@ static bool torture_rpc_smb2_pipe_read_tdis(struct torture_context *torture) status = smb2_connect(mem_ctx, host, "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, @@ -4488,6 +4493,7 @@ static bool torture_rpc_smb2_pipe_read_logoff(struct torture_context *torture) status = smb2_connect(mem_ctx, host, "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, @@ -4566,6 +4572,7 @@ static bool torture_rpc_lsa_over_netlogon(struct torture_context *torture) status = smb2_connect(mem_ctx, torture_setting_string(torture, "host", NULL), "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, @@ -4636,6 +4643,7 @@ static bool torture_rpc_pipes_supported_interfaces( status = smb2_connect(mem_ctx, torture_setting_string(torture, "host", NULL), "IPC$", + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), &tree, diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 7f0ce6e21c3..eae67bae439 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -8971,6 +8971,7 @@ static bool test_print_test_smbd(struct torture_context *tctx, status = smb2_connect(mem_ctx, torture_setting_string(tctx, "host", NULL), share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree, diff --git a/source4/torture/smb2/credits.c b/source4/torture/smb2/credits.c index 219deb9ca8f..d43802730a8 100644 --- a/source4/torture/smb2/credits.c +++ b/source4/torture/smb2/credits.c @@ -714,6 +714,7 @@ static bool test_ipc_max_data_zero(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree1, @@ -761,6 +762,7 @@ static bool test_1conn_ipc_max_async_credits(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree1, @@ -819,6 +821,7 @@ static bool test_2conn_ipc_max_async_credits(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree1, @@ -836,6 +839,7 @@ static bool test_2conn_ipc_max_async_credits(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree2, @@ -899,6 +903,7 @@ static bool test_multichannel_ipc_max_async_credits( status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree1a, @@ -916,6 +921,7 @@ static bool test_multichannel_ipc_max_async_credits( status = smb2_connect(tree1a, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree1b_base, @@ -1469,6 +1475,7 @@ static bool test_multichannel_notify_max_async_credits( status = smb2_connect(tree1a, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree1b_base, diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c index 7a0a7e51c36..e62ea9f065c 100644 --- a/source4/torture/smb2/ioctl.c +++ b/source4/torture/smb2/ioctl.c @@ -7184,6 +7184,7 @@ static bool test_ioctl_bug14788_VALIDATE_NEGOTIATE(struct torture_context *tortu status = smb2_connect(torture, host, share, + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), credentials, &tree, @@ -7286,6 +7287,7 @@ static bool test_ioctl_bug14788_NETWORK_INTERFACE(struct torture_context *tortur status = smb2_connect(torture, host, share, + torture->lp_ctx, lpcfg_resolve_context(torture->lp_ctx), credentials, &tree, diff --git a/source4/torture/smb2/multichannel.c b/source4/torture/smb2/multichannel.c index 2e564dc3d4d..8c0e0a3f05e 100644 --- a/source4/torture/smb2/multichannel.c +++ b/source4/torture/smb2/multichannel.c @@ -220,6 +220,7 @@ static struct smb2_tree *test_multichannel_create_channel( status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree, @@ -2018,6 +2019,7 @@ static bool test_multichannel_num_channels(struct torture_context *tctx, smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2[i], diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index b25d5a6606e..8215159d88d 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -292,6 +292,7 @@ static bool open_smb2_connection_no_level2_oplocks(struct torture_context *tctx, options.use_level2_oplocks = false; status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), tree, tctx->ev, &options, diff --git a/source4/torture/smb2/replay.c b/source4/torture/smb2/replay.c index 6d410a71eba..5c93fda3d44 100644 --- a/source4/torture/smb2/replay.c +++ b/source4/torture/smb2/replay.c @@ -2837,6 +2837,7 @@ static bool _test_dhv2_pending2_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2_2, @@ -2866,6 +2867,7 @@ static bool _test_dhv2_pending2_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2_3, @@ -2895,6 +2897,7 @@ static bool _test_dhv2_pending2_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2_4, @@ -3670,6 +3673,7 @@ static bool _test_dhv2_pending3_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2_2, @@ -3699,6 +3703,7 @@ static bool _test_dhv2_pending3_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2_3, @@ -3728,6 +3733,7 @@ static bool _test_dhv2_pending3_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2_4, @@ -4764,6 +4770,7 @@ static bool test_replay3(struct torture_context *tctx, struct smb2_tree *tree1) status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree2, @@ -4985,6 +4992,7 @@ static bool test_replay4(struct torture_context *tctx, struct smb2_tree *tree1) status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree2, diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index 570b6112e38..d73168e1a1d 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -213,6 +213,7 @@ static bool torture_smb2_scan(struct torture_context *tctx) status = smb2_connect(mem_ctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree, tctx->ev, &options, @@ -230,6 +231,7 @@ static bool torture_smb2_scan(struct torture_context *tctx) talloc_free(tree); status = smb2_connect(mem_ctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), &tree, tctx->ev, &options, diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c index ca1d6ca8a37..f8f4eac511f 100644 --- a/source4/torture/smb2/session.c +++ b/source4/torture/smb2/session.c @@ -1127,6 +1127,7 @@ static bool test_session_expire1i(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree, @@ -1371,6 +1372,7 @@ static bool test_session_expire2i(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree, @@ -1789,6 +1791,7 @@ static bool test_session_expire_disconnect(struct torture_context *tctx) status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree, @@ -1927,6 +1930,7 @@ bool test_session_bind1(struct torture_context *tctx, struct smb2_tree *tree1) status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2, @@ -2093,6 +2097,7 @@ static bool test_session_bind2(struct torture_context *tctx, struct smb2_tree *t status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2, @@ -2131,6 +2136,7 @@ static bool test_session_bind2(struct torture_context *tctx, struct smb2_tree *t status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree3, @@ -2387,6 +2393,7 @@ static bool test_session_bind_auth_mismatch(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), creds1, &tree2, @@ -2683,6 +2690,7 @@ static bool test_session_bind_negative_smbXtoX(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree1, @@ -2721,6 +2729,7 @@ static bool test_session_bind_negative_smbXtoX(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials, &tree2_0, @@ -5124,6 +5133,7 @@ static bool test_session_sign_enc(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), credentials1, &tree1, @@ -5612,6 +5622,7 @@ static bool test_session_anon_encryption1(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), anon_creds, &anon_tree, @@ -5744,6 +5755,7 @@ static bool test_session_anon_encryption2(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), user_creds, &user_tree, @@ -5890,6 +5902,7 @@ static bool test_session_anon_encryption3(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), user_creds, &user_tree, @@ -6007,6 +6020,7 @@ static bool test_session_anon_signing1(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), anon_creds, &anon_tree, @@ -6106,6 +6120,7 @@ static bool test_session_anon_signing2(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), anon_creds, &anon_tree, @@ -6302,6 +6317,7 @@ static bool test_session_require_sign_bug15397(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), creds, &tree, diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 998b1e8020b..00f69030f82 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -472,6 +472,7 @@ bool torture_smb2_con_share(struct torture_context *tctx, status = smb2_connect(tctx, host, share, + tctx->lp_ctx, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), tree,