10000 [pull] master from samba-team:master by pull[bot] · Pull Request #1203 · szaydel/samba · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[pull] master from samba-team:master #1203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 95 commits into from
Apr 18, 2025
Merged

[pull] master from samba-team:master #1203

merged 95 commits into from
Apr 18, 2025

Conversation

pull[bot]
Copy link
@pull pull bot commented Apr 18, 2025 •
edited
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

@metze-samba
s4:libcli/smb_composite: remove unused struct smb_composite_connectmulti
5889e43 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
libcli/smb: add struct smb_transports infrastructure
43a5fd5 
This will be able to use a structure instead of
a string array with int string values for 'smb ports'.

We'll soon add support for smb over quic, so
we need something better than tcp ports with
139 being special.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: introduce smbcli_options.transports based on lpcfg_smb_por…
77055ea 
…ts()

This will allow us to avoid passing lpcfg_smb_ports() explicitly
in a lot of places in the following commits.

Once that's done we will change away from "smb ports" to
something like "client smb transports".

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct smbcli_options to smbcli_sock_connect() instea…
5277e32 
…d of port strings

This allows us to build the ports array from options.transports.

Pair-Programmed-With: Ralph Boehme <slow@samba.org>

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused dest_ports from smb_connect_nego_send()
a8a1c86 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused ports argument from smb2_connect_send
8f7e8aa 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused ports argument from smb2_connect_ext()
9dbb291 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused ports from smb2_connect()
a78e777 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused dest_ports from struct smb_composite_connect
8408f0d 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:torture/raw: remove unused dest_port handling from openbench.c
7707699 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused ports from struct smb_composite_fetchfile
b35610f 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused dest_ports struct smb_composite_fsinfo
82c10a6 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused dest_ports from smbcli_tree_full_connection()
aa13d3f 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused ports from smbcli_socket_connect()
cde5428 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:client: remove unused destports from do_message_op()
3a39c61 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused ports from smbcli_full_connection()
45d58ef 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:client: remove unused ports from cifsdd* functions
cbc8aa2 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:torture: remove unused ports from masktests.c
fda0f2e 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:client: remove unused ports from do_connect()
cecc68f 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: let smbd_accept_connection() use samba_sockaddr to avoid str…
baec5eb 
…ict-aliasing warnings

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: let smbd_{addr_changed,close_socket_for_ip}() use samba_sock…
9b0e254 
…addr to avoid strict-aliasing warnings

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: remove unused dns_port variable from smbd_open_socket_for_ip()
c4d9312 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: only do dns_port logic in one central place.
b8d76d0 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: simplify binding to wildcard addresses
f35aa7e 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: let smbd_open_socket_for_ip() return the number of successfu…
1621560 
…l binds

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: remove unused msg_ctx argument from smbd_open_socket_for_ip()
e6bd60a 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: let open_sockets_smbd() use smbd_open_socket_for_ip()
5b47f2a 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: setup parent->transports from 'smb ports'
1f3f8c4 
This will be used in the next commits and in the
end derived from the 'server smb transports' option.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: use parent->transports instead of 'smb ports' strings
25a0d9f 
This will simplify adding new transports as 'quic' or 'smbdirect'
in future.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:smb_server: make use of smb_transports_parse() in smbsrv_add_socket()
f486a9c 
Here we will only support tcp and nbt...,
but that will simplify the global transition from 'smb ports' to
'server smb transports'.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: expand scope of lp_ctx variable in main()
307146f 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbd: store transport_type in smbXsrv_channel_global0
10e4aa6 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:smbstatus: provide the transport type via json output
8000
3e0d147 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:libsmb: introduce smbsock_connect.h
9f76585 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: use the correct talloc parent for smbcli_socket->hostname
4e2435a 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: simplify struct smbcli_socket
228f2a9 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb_connect_nego_send()
cdf546f 
It will be passed further down in the next commits.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb2_connect()
092d320 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb2_connect_ext()
4d07f2c 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb2_connect_send()
d9b331f 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smbcli_socket_connect()
d63cdcf 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smbcli_sock_connect()
df43b1e 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smbcli_full_connection()
e19f696 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smbcli_tree_full_connection()
b00f5d3 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb_composite_connect()
c8e9441 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused smb_composite_fsinfo()
282211e 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb_composite_fsinfo_send()
6575455 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: remove unused smb_composite_fetchfile()
e9e446a 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb_composite_fetchfile_se…
9999085 
…nd()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smb_composite_connect_send()
4f939cc 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: pass struct loadparm_context to smbcli_sock_connect_send()
2bc8f45 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:libsmb: pass struct loadparm_context to smbsock_any_connect()
56f8352 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:libsmb: pass struct loadparm_context to smbsock_any_connect_send()
290ed5e 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:libsmb: pass struct loadparm_context to smbsock_connect()
959640c 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:libsmb: pass struct loadparm_context to smbsock_connect_send()
306c283 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s4:libcli: make use of smbsock_any_connect_send/recv()
171b95a 
This means have only one codepath that connects based
on struct smb_transports.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
libcli/util: map EPROTONOSUPPORT to NT_STATUS_PROTOCOL_NOT_SUPPORTED
87a9cd4 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
@metze-samba
s3:lib: map EPROTONOSUPPORT to NT_STATUS_PROTOCOL_NOT_SUPPORTED
daea4ad 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Fri Apr 18 11:18:42 UTC 2025 on atb-devel-224
@pull pull bot added the ⤵️ pull label Apr 18, 2025
@pull pull bot merged commit daea4ad into szaydel:master Apr 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
⤵️ pull
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@metze-samba
0