From: Stefan Metzmacher Date: Thu, 3 Apr 2025 08:21:42 +0000 (+0200) Subject: s4:libcli: remove unused ports from smb2_connect() X-Git-Tag: tevent-0.17.0~316 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a78e777b2a95de4246069c305ab2d715613e7611;p=thirdparty%2Fsamba.git s4:libcli: remove unused ports from 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 e62f5797c7b..f1a9164f9f3 100644 --- a/source4/libcli/smb2/connect.c +++ b/source4/libcli/smb2/connect.c @@ -450,7 +450,6 @@ NTSTATUS smb2_connect_ext(TALLOC_CTX *mem_ctx, NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx, const char *host, - const char **ports, const char *share, struct resolve_context *resolve_ctx, struct cli_credentials *credentials, diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index d1dbb203c6f..1ceb1299503 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -230,7 +230,6 @@ static bool connect_servers(struct tevent_context *ev, if (options.smb2) { status = smb2_connect(NULL, servers[i].server_name, - lpcfg_smb_ports(lp_ctx), servers[i].share_name, lpcfg_resolve_context(lp_ctx), servers[i].credentials, diff --git a/source4/torture/rpc/fsrvp.c b/source4/torture/rpc/fsrvp.c index c859bf4bbff..e6f7fddfdae 100644 --- a/source4/torture/rpc/fsrvp.c +++ b/source4/torture/rpc/fsrvp.c @@ -553,7 +553,6 @@ static bool test_fsrvp_sc_share_io(struct torture_context *tctx, status = smb2_connect(tmp_ctx, dcerpc_server_name(p), - lpcfg_smb_ports(tctx->lp_ctx), FSHARE, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -584,7 +583,6 @@ static bool test_fsrvp_sc_share_io(struct torture_context *tctx, /* connect to snapshot share and verify pre-snapshot data */ status = smb2_connect(tmp_ctx, dcerpc_server_name(p), - lpcfg_smb_ports(tctx->lp_ctx), sc_map->ShadowCopyShareName, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -677,7 +675,6 @@ static bool test_fsrvp_enum_created(struct torture_context *tctx, status = smb2_connect(tmp_ctx, dcerpc_server_name(p), - lpcfg_smb_ports(tctx->lp_ctx), FSHARE, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 6592d996b61..3fc6f347a36 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -3722,7 +3722,6 @@ static bool torture_rpc_smb2_reauth1(struct torture_context *torture) status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), @@ -3872,7 +3871,6 @@ static bool torture_rpc_smb2_reauth2(struct torture_context *torture) status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), @@ -4239,7 +4237,6 @@ static bool torture_rpc_smb2_pipe_name(struct torture_context *torture) status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), @@ -4333,7 +4330,6 @@ static bool torture_rpc_smb2_pipe_read_close(struct torture_context *torture) status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), @@ -4417,7 +4413,6 @@ static bool torture_rpc_smb2_pipe_read_tdis(struct torture_context *torture) status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), @@ -4501,7 +4496,6 @@ static bool torture_rpc_smb2_pipe_read_logoff(struct torture_context *torture) status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), @@ -4580,7 +4574,6 @@ static bool torture_rpc_lsa_over_netlogon(struct torture_context *torture) status = smb2_connect(mem_ctx, torture_setting_string(torture, "host", NULL), - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), @@ -4651,7 +4644,6 @@ static bool torture_rpc_pipes_supported_interfaces( status = smb2_connect(mem_ctx, torture_setting_string(torture, "host", NULL), - lpcfg_smb_ports(torture->lp_ctx), "IPC$", lpcfg_resolve_context(torture->lp_ctx), samba_cmdline_get_creds(), diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 626a6ff80e8..cff98b79e0b 100644 --- a/source4/torture/rpc/spoolss.c +++ b/source4/torture/rpc/spoolss.c @@ -8970,7 +8970,6 @@ static bool test_print_test_smbd(struct torture_context *tctx, status = smb2_connect(mem_ctx, torture_setting_string(tctx, "host", NULL), - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), diff --git a/source4/torture/smb2/credits.c b/source4/torture/smb2/credits.c index ad0918d1c63..219deb9ca8f 100644 --- a/source4/torture/smb2/credits.c +++ b/source4/torture/smb2/credits.c @@ -713,7 +713,6 @@ static bool test_ipc_max_data_zero(struct torture_context *tctx, /* Create connection to IPC$ */ status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -761,7 +760,6 @@ static bool test_1conn_ipc_max_async_credits(struct torture_context *tctx, /* Create connection to IPC$ */ status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -820,7 +818,6 @@ static bool test_2conn_ipc_max_async_credits(struct torture_context *tctx, /* Create connection to IPC$ */ status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -838,7 +835,6 @@ static bool test_2conn_ipc_max_async_credits(struct torture_context *tctx, /* Create connection to IPC$ */ status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -902,7 +898,6 @@ static bool test_multichannel_ipc_max_async_credits( /* Create connection to IPC$ */ status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -920,7 +915,6 @@ static bool test_multichannel_ipc_max_async_credits( status = smb2_connect(tree1a, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -1474,7 +1468,6 @@ static bool test_multichannel_notify_max_async_credits( status = smb2_connect(tree1a, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c index 7979e129ba7..7a0a7e51c36 100644 --- a/source4/torture/smb2/ioctl.c +++ b/source4/torture/smb2/ioctl.c @@ -7183,7 +7183,6 @@ static bool test_ioctl_bug14788_VALIDATE_NEGOTIATE(struct torture_context *tortu status = smb2_connect(torture, host, - lpcfg_smb_ports(torture->lp_ctx), share, lpcfg_resolve_context(torture->lp_ctx), credentials, @@ -7286,7 +7285,6 @@ static bool test_ioctl_bug14788_NETWORK_INTERFACE(struct torture_context *tortur status = smb2_connect(torture, host, - lpcfg_smb_ports(torture->lp_ctx), share, lpcfg_resolve_context(torture->lp_ctx), credentials, diff --git a/source4/torture/smb2/multichannel.c b/source4/torture/smb2/multichannel.c index 332268eb4a1..2e564dc3d4d 100644 --- a/source4/torture/smb2/multichannel.c +++ b/source4/torture/smb2/multichannel.c @@ -219,7 +219,6 @@ static struct smb2_tree *test_multichannel_create_channel( status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -2018,7 +2017,6 @@ static bool test_multichannel_num_channels(struct torture_context *tctx, torture_assert_ntstatus_ok_goto(tctx, smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c index 90bf4d20655..b25d5a6606e 100644 --- a/source4/torture/smb2/oplock.c +++ b/source4/torture/smb2/oplock.c @@ -291,8 +291,7 @@ static bool open_smb2_connection_no_level2_oplocks(struct torture_context *tctx, lpcfg_smbcli_options(tctx->lp_ctx, &options); options.use_level2_oplocks = false; - status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, + status = smb2_connect(tctx, host, share, 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 d84ced8b191..6d410a71eba 100644 --- a/source4/torture/smb2/replay.c +++ b/source4/torture/smb2/replay.c @@ -2836,7 +2836,6 @@ static bool _test_dhv2_pending2_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -2866,7 +2865,6 @@ static bool _test_dhv2_pending2_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -2896,7 +2894,6 @@ static bool _test_dhv2_pending2_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -3672,7 +3669,6 @@ static bool _test_dhv2_pending3_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -3702,7 +3698,6 @@ static bool _test_dhv2_pending3_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -3732,7 +3727,6 @@ static bool _test_dhv2_pending3_vs_hold(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -4769,7 +4763,6 @@ static bool test_replay3(struct torture_context *tctx, struct smb2_tree *tree1) status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -4991,7 +4984,6 @@ static bool test_replay4(struct torture_context *tctx, struct smb2_tree *tree1) status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index 086cc75041b..570b6112e38 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -212,7 +212,6 @@ static bool torture_smb2_scan(struct torture_context *tctx) lpcfg_smbcli_options(tctx->lp_ctx, &options); status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), @@ -230,7 +229,6 @@ static bool torture_smb2_scan(struct torture_context *tctx) if (!smb2_request_receive(req)) { talloc_free(tree); status = smb2_connect(mem_ctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(), diff --git a/source4/torture/smb2/session.c b/source4/torture/smb2/session.c index ecaac76e6c3..ca1d6ca8a37 100644 --- a/source4/torture/smb2/session.c +++ b/source4/torture/smb2/session.c @@ -1126,7 +1126,6 @@ static bool test_session_expire1i(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -1371,7 +1370,6 @@ static bool test_session_expire2i(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -1790,7 +1788,6 @@ static bool test_session_expire_disconnect(struct torture_context *tctx) status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -1929,7 +1926,6 @@ bool test_session_bind1(struct torture_context *tctx, struct smb2_tree *tree1) status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -2096,7 +2092,6 @@ static bool test_session_bind2(struct torture_context *tctx, struct smb2_tree *t status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -2135,7 +2130,6 @@ static bool test_session_bind2(struct torture_context *tctx, struct smb2_tree *t status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -2392,7 +2386,6 @@ static bool test_session_bind_auth_mismatch(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), creds1, @@ -2689,7 +2682,6 @@ static bool test_session_bind_negative_smbXtoX(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -2728,7 +2720,6 @@ static bool test_session_bind_negative_smbXtoX(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials, @@ -5132,7 +5123,6 @@ static bool test_session_sign_enc(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), credentials1, @@ -5621,7 +5611,6 @@ static bool test_session_anon_encryption1(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), anon_creds, @@ -5754,7 +5743,6 @@ static bool test_session_anon_encryption2(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), user_creds, @@ -5901,7 +5889,6 @@ static bool test_session_anon_encryption3(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), user_creds, @@ -6019,7 +6006,6 @@ static bool test_session_anon_signing1(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), anon_creds, @@ -6119,7 +6105,6 @@ static bool test_session_anon_signing2(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), anon_creds, @@ -6316,7 +6301,6 @@ static bool test_session_require_sign_bug15397(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), creds, diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index 0e8b3e78ba9..998b1e8020b 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -471,7 +471,6 @@ bool torture_smb2_con_share(struct torture_context *tctx, status = smb2_connect(tctx, host, - lpcfg_smb_ports(tctx->lp_ctx), share, lpcfg_resolve_context(tctx->lp_ctx), samba_cmdline_get_creds(),