[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Fri Apr 18 11:19:02 UTC 2025
The branch, master has been updated
via daea4ad9f49 s3:lib: map EPROTONOSUPPORT to NT_STATUS_PROTOCOL_NOT_SUPPORTED
via 87a9cd4f1e6 libcli/util: map EPROTONOSUPPORT to NT_STATUS_PROTOCOL_NOT_SUPPORTED
via 171b95a042a s4:libcli: make use of smbsock_any_connect_send/recv()
via 306c2838fb3 s3:libsmb: pass struct loadparm_context to smbsock_connect_send()
via 959640c33d3 s3:libsmb: pass struct loadparm_context to smbsock_connect()
via 290ed5e3330 s3:libsmb: pass struct loadparm_context to smbsock_any_connect_send()
via 56f8352eb4f s3:libsmb: pass struct loadparm_context to smbsock_any_connect()
via 2bc8f45c2f0 s4:libcli: pass struct loadparm_context to smbcli_sock_connect_send()
via 4f939cc3160 s4:libcli: pass struct loadparm_context to smb_composite_connect_send()
via 99990857232 s4:libcli: pass struct loadparm_context to smb_composite_fetchfile_send()
via e9e446a0fca s4:libcli: remove unused smb_composite_fetchfile()
via 657545516f7 s4:libcli: pass struct loadparm_context to smb_composite_fsinfo_send()
via 282211ef449 s4:libcli: remove unused smb_composite_fsinfo()
via c8e9441673a s4:libcli: pass struct loadparm_context to smb_composite_connect()
via b00f5d315d3 s4:libcli: pass struct loadparm_context to smbcli_tree_full_connection()
via e19f696b785 s4:libcli: pass struct loadparm_context to smbcli_full_connection()
via df43b1e96c9 s4:libcli: pass struct loadparm_context to smbcli_sock_connect()
via d63cdcfe9c7 s4:libcli: pass struct loadparm_context to smbcli_socket_connect()
via d9b331f06cc s4:libcli: pass struct loadparm_context to smb2_connect_send()
via 4d07f2c8ecc s4:libcli: pass struct loadparm_context to smb2_connect_ext()
via 092d32032bb s4:libcli: pass struct loadparm_context to smb2_connect()
via cdf546f6ae7 s4:libcli: pass struct loadparm_context to smb_connect_nego_send()
via 228f2a9bd8a s4:libcli: simplify struct smbcli_socket
via 4e2435ab6da s4:libcli: use the correct talloc parent for smbcli_socket->hostname
via 9f76585754a s3:libsmb: introduce smbsock_connect.h
via 3e0d1478f46 s3:smbstatus: provide the transport type via json output
via 10e4aa6a6d2 s3:smbd: store transport_type in smbXsrv_channel_global0
via 307146f785d s3:smbd: expand scope of lp_ctx variable in main()
via dc602bba756 s4:ldap_server: make use of tstream_tls_params_server_lpcfg()
via 6001ae6df29 s4:lib/tls: introduce tstream_tls_params_server_lpcfg()
via fb3e5430d31 example/winexe: pass struct smb_transports through some more layers
via b4ba2cb91ea example/fuse: pass struct smb_transports to connect_one()
via e6002830fc5 s3:libsmb: pass struct smb_transports to cli_full_connection_creds()
via ef21ac394d7 s3:libsmb: pass struct smb_transports to cli_full_connection_creds_send()
via 36cdd086c39 s3:pylibsmb: add stackframe to py_cli_state_init()
via 272fbb1c9cc s3:libsmb: pass struct smb_transports to cli_cm_connect() and cli_cm_open()
via 9dbe5499c52 s3:libsmb: pass struct smb_transports to do_connect()
via aa3e840baa6 s3:libsmb: pass struct smb_transports to SMBC_server_internal()
via d1147ddd01b s3:smbspool: pass struct smb_transports to smb_connect()
via 3b52d73482a s3:smbspool: pass struct smb_transports to smb_complete_connection()
via 7a3647fda8c s3:libsmb: pass struct smb_transports to cli_start_connection()
via 18028beb9fc s3:libsmb: pass struct smb_transports to cli_start_connection_send()
via 425d3ce7b54 s3:libsmb: pass struct smb_transports to cli_connect_nb()
via 0e6db83ff13 s3:libsmb: pass struct smb_transports to cli_connect_nb_send()
via 3d3bef61964 s3:libsmb: pass struct smb_transports to cli_connect_sock_send()
via ffa72afa65f s3:libsmb: pass struct smb_transports to smbsock_any_connect()
via 74d79a6bf6b s3:libsmb: pass struct smb_transports to smbsock_any_connect_send()
via d3374048761 s3:libsmb: pass struct smb_transports to smbsock_connect()
via c39b11b482b s3:libsmb: pass struct smb_transports to smbsock_connect_send()
via 1c76a075b73 lib/util: fix NONNULL(params) __attribute__((nonnull(params)))
via d00755ca4b3 s3:libsmb: rework smbsock_connect_* to work on smb_transports internally
via 9725668d632 s3:lib: remove unused open_socket_out_defer_send/recv
via 6934c7ae402 s3:lib: pass 'protocol' to open_socket_out_send()
via 714409b49c8 s3:lib: let open_socket_out_send() use samba_sockaddr to avoid strict-aliasing warnings
via 6bbcf1114c1 s3:smbd: use open_socket_in_protocol() in smbd_open_one_socket()
via 681a6377817 s3:lib: split out open_socket_in_protocol()
via ae85b9c8789 docs-xml/smbdotconf: change 'smb ports' into a synonym for 'server smb transport'
via 50c25dc6634 ctdb:events: let 50.samba.script use 'server smb transports'
via cbcc94be543 ctdb:events: let 50.samba.script normalize the transports to tcp ports
via 5fc5218257c s3:smbd: setup parent->transports from 'server smb transports'
via c7787dd3580 s4:smb_server: make use of lpcfg_server_smb_transports() in smbsrv_add_socket()
via 6a835ec933d docs-xml/smbdotconf: add 'server smb transport' option
via b1a73241390 s4:torture: map --smb-ports option to 'client smb transports'
via 28ee01778f8 s4:param: let lpcfg_smbcli_options() use lpcfg_client_smb_transports()
via da9cb652140 docs-xml/smbdotconf: add 'client smb transports' option
via f486a9c93d1 s4:smb_server: make use of smb_transports_parse() in smbsrv_add_socket()
via 25a0d9fd5fe s3:smbd: use parent->transports instead of 'smb ports' strings
via 1f3f8c4a6ba s3:smbd: setup parent->transports from 'smb ports'
via 5b47f2adf2a s3:smbd: let open_sockets_smbd() use smbd_open_socket_for_ip()
via e6bd60ac3fb s3:smbd: remove unused msg_ctx argument from smbd_open_socket_for_ip()
via 162156057b1 s3:smbd: let smbd_open_socket_for_ip() return the number of successful binds
via f35aa7ecc00 s3:smbd: simplify binding to wildcard addresses
via b8d76d07393 s3:smbd: only do dns_port logic in one central place.
via c4d931255cf s3:smbd: remove unused dns_port variable from smbd_open_socket_for_ip()
via 9b0e254738f s3:smbd: let smbd_{addr_changed,close_socket_for_ip}() use samba_sockaddr to avoid strict-aliasing warnings
via baec5eb146c s3:smbd: let smbd_accept_connection() use samba_sockaddr to avoid strict-aliasing warnings
via cecc68f6655 s4:client: remove unused ports from do_connect()
via fda0f2e71a2 s4:torture: remove unused ports from masktests.c
via cbc8aa2e51b s4:client: remove unused ports from cifsdd* functions
via 45d58ef5f8e s4:libcli: remove unused ports from smbcli_full_connection()
via 3a39c6157a3 s4:client: remove unused destports from do_message_op()
via cde54286e35 s4:libcli: remove unused ports from smbcli_socket_connect()
via aa13d3f9b69 s4:libcli: remove unused dest_ports from smbcli_tree_full_connection()
via 82c10a6b6a5 s4:libcli: remove unused dest_ports struct smb_composite_fsinfo
via b35610f990f s4:libcli: remove unused ports from struct smb_composite_fetchfile
via 770769929d6 s4:torture/raw: remove unused dest_port handling from openbench.c
via 8408f0d6124 s4:libcli: remove unused dest_ports from struct smb_composite_connect
via a78e777b2a9 s4:libcli: remove unused ports from smb2_connect()
via 9dbb29138ae s4:libcli: remove unused ports argument from smb2_connect_ext()
via 8f7e8aa35e4 s4:libcli: remove unused ports argument from smb2_connect_send
via a8a1c86cf4e s4:libcli: remove unused dest_ports from smb_connect_nego_send()
via 5277e326012 s4:libcli: pass struct smbcli_options to smbcli_sock_connect() instead of port strings
via 77055eada7c s4:libcli: introduce smbcli_options.transports based on lpcfg_smb_ports()
via 43a5fd564ca libcli/smb: add struct smb_transports infrastructure
via 5889e43c40c s4:libcli/smb_composite: remove unused struct smb_composite_connectmulti
from 80d5fa134d5 libcli/smb: make smb2_lease_{pull,push} endian safe
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit daea4ad9f49f8694a66756ba9d275edb71a4a879
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 15 13:48:54 2025 +0200
s3:lib: map EPROTONOSUPPORT to NT_STATUS_PROTOCOL_NOT_SUPPORTED
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Fri Apr 18 11:18:42 UTC 2025 on atb-devel-224
commit 87a9cd4f1e69a6e8be32c18d3d772b324a2efcc1
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 15 13:48:54 2025 +0200
libcli/util: map EPROTONOSUPPORT to NT_STATUS_PROTOCOL_NOT_SUPPORTED
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 171b95a042a0c708afeb987ca2b7ba01e4b9115b
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 9 15:17:12 2025 +0200
s4:libcli: make use of smbsock_any_connect_send/recv()
This means have only one codepath that connects based
on struct smb_transports.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 306c2838fb3a3ef5119828cea8d53bb500985bc5
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s3:libsmb: pass struct loadparm_context to smbsock_connect_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 959640c33d3c24855777aa4e799ab20107a3d3c7
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s3:libsmb: pass struct loadparm_context to smbsock_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 290ed5e333064dc71c276ae1991b81b76e4dfeaf
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s3:libsmb: pass struct loadparm_context to smbsock_any_connect_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 56f8352eb4fc9bb6f94d260813902e9ff5bf2142
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s3:libsmb: pass struct loadparm_context to smbsock_any_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 2bc8f45c2f0eb142f7383d86cd3dfe32a521fa4f
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smbcli_sock_connect_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 4f939cc3160dc5ed6476b010f666dbaca064f1d1
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smb_composite_connect_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 999908572324b4a2de4aa0a45b07f452da8242c4
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smb_composite_fetchfile_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit e9e446a0fcabb6a66bea76ade25dc76ef5986ab0
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 20:33:41 2025 +0200
s4:libcli: remove unused smb_composite_fetchfile()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 657545516f7ad0c9523a5688778febe01bbc4eae
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smb_composite_fsinfo_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 282211ef4498a604ce048acc3d135c50ba48641b
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 20:28:39 2025 +0200
s4:libcli: remove unused smb_composite_fsinfo()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit c8e9441673add6bb39e19d1dacc5b8dc4c45fdeb
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smb_composite_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit b00f5d315d344b4aa9f7308d28510e247f1b9ca9
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smbcli_tree_full_connection()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit e19f696b785e30b07aba16dc22cd2df6eb92c3e4
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smbcli_full_connection()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit df43b1e96c9fc29a171440b84314c2a6c53f7fd4
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smbcli_sock_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d63cdcfe9c73210c0b837d575d271c508134c5cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smbcli_socket_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d9b331f06cc8edac76d14ff52a728fc7f6256f02
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smb2_connect_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 4d07f2c8eccd932b613415a524e655b215c24731
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smb2_connect_ext()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 092d32032bb1df0b368631cfaab6c066f4fa9f2a
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:48:48 2025 +0200
s4:libcli: pass struct loadparm_context to smb2_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit cdf546f6ae74f8278c4a1ae85e99528f7083994d
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 10 16:04:47 2025 +0200
s4:libcli: pass struct loadparm_context to smb_connect_nego_send()
It will be passed further down in the next commits.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 228f2a9bd8aec150387c1bc4ba913651f769da91
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 8 16:21:04 2025 +0200
s4:libcli: simplify struct smbcli_socket
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 4e2435ab6dabc30b9158338d40fa21d25ad7c4b1
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 9 15:37:11 2025 +0200
s4:libcli: use the correct talloc parent for smbcli_socket->hostname
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 9f76585754a43ea175db0e21e08220ca9a23866f
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 9 16:54:36 2025 +0200
s3:libsmb: introduce smbsock_connect.h
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 3e0d1478f46984736f2358b68497dc765c3a079c
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 8 14:28:39 2025 +0200
s3:smbstatus: provide the transport type via json output
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 10e4aa6a6d25b9e94011847b3a5b454165612ce4
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 8 14:20:36 2025 +0200
s3:smbd: store transport_type in smbXsrv_channel_global0
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 307146f785d39809a3e385a374f1e70db951fa28
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 8 09:42:50 2025 +0200
s3:smbd: expand scope of lp_ctx variable in main()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit dc602bba756801f9ceb87092af6146f311ca7be2
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 8 09:45:12 2025 +0200
s4:ldap_server: make use of tstream_tls_params_server_lpcfg()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 6001ae6df29103721bfe546df503995c850c9df7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Apr 7 18:15:53 2025 +0200
s4:lib/tls: introduce tstream_tls_params_server_lpcfg()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit fb3e5430d31800e91473a4382e2373aea0c5c650
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
example/winexe: pass struct smb_transports through some more layers
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit b4ba2cb91ea19349dbb9ce6897dca2db0aec7644
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
example/fuse: pass struct smb_transports to connect_one()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit e6002830fc5bea54794a634a9c7a3249b608b549
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_full_connection_creds()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit ef21ac394d7d03670f4ca180afbda1f6e660abdf
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_full_connection_creds_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 36cdd086c39c0cb69b83cc7a130f677a9b82f7e5
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 22:21:25 2025 +0200
s3:pylibsmb: add stackframe to py_cli_state_init()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 272fbb1c9cc1e12d7480df9df2ecdbabb8fdb71a
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_cm_connect() and cli_cm_open()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 9dbe5499c52335d74dd9c092ada4b3fd4257bb92
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to do_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit aa3e840baa6a133fa8de14df0992e2f90b1622bc
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to SMBC_server_internal()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d1147ddd01b403e947534cd5231834c90553a92c
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:smbspool: pass struct smb_transports to smb_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 3b52d73482a3081cd4c5d1d9920b13b23d5a849d
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:smbspool: pass struct smb_transports to smb_complete_connection()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 7a3647fda8cff5f724a339dbc9dab4659dceb770
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_start_connection()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 18028beb9fc0a8aff00ae400309a0054aabbd2c0
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_start_connection_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 425d3ce7b54c52c81a5cf00da753596a0f48bd8c
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_connect_nb()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 0e6db83ff13d914210db2cb206fb1aae957dab2a
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_connect_nb_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 3d3bef6196466e92c1278e764f5a54fc492737a7
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to cli_connect_sock_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit ffa72afa65f012dfe9cc02b586d92ba8683f2c27
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to smbsock_any_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 74d79a6bf6b3afb8470afb172f19a10127c860d2
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 19:05:19 2025 +0200
s3:libsmb: pass struct smb_transports to smbsock_any_connect_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d337404876193548c6ed135450bb0b05399d6e61
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Apr 5 17:50:16 2025 +0200
s3:libsmb: pass struct smb_transports to smbsock_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit c39b11b482b4394445056fc39d79cf5c916b053c
Author: Stefan Metzmacher <metze at samba.org>
Date: Sat Apr 5 17:50:16 2025 +0200
s3:libsmb: pass struct smb_transports to smbsock_connect_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 1c76a075b73b927d54646787fe2feba0b5d7beb9
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Apr 6 21:05:12 2025 +0200
lib/util: fix NONNULL(params) __attribute__((nonnull(params)))
This should be set on the function prototype itself specifying
all non null arguments e.g.
NONNULL(1) NONNULL(3)
int foo(const char *arg1, int arg2, const char *arg3);
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit d00755ca4b33f5ab1d8ffe6cd681e58842637ccf
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Apr 4 17:04:50 2025 +0200
s3:libsmb: rework smbsock_connect_* to work on smb_transports internally
We try the first transport first and all others after 5msecs,
but if one fails we start the next one.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 9725668d632e71156a4b4031342ceec14ba4f9cf
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Apr 4 13:48:54 2025 +0200
s3:lib: remove unused open_socket_out_defer_send/recv
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 6934c7ae402ee7ef593b613022f0330303766287
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Apr 4 13:33:31 2025 +0200
s3:lib: pass 'protocol' to open_socket_out_send()
For now this is always explicitly IPPROTO_TCP,
but that will change when we add support for IPPROTO_QUIC.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 714409b49c87ea2af532f00c3f1e4d5774c6c7e8
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Apr 4 13:24:32 2025 +0200
s3:lib: let open_socket_out_send() use samba_sockaddr to avoid strict-aliasing warnings
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 6bbcf1114c1b0382f167cc9baf25900809bf60c5
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 8 11:16:10 2025 +0200
s3:smbd: use open_socket_in_protocol() in smbd_open_one_socket()
For now this is always explicitly IPPROTO_TCP,
but that will change when we add support for IPPROTO_QUIC.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 681a6377817ad5744d7d9d281dc8fa62c258f7e1
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 17:14:32 2025 +0200
s3:lib: split out open_socket_in_protocol()
This will be useful if we want to listen on IPPROTO_QUIC
sockets.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit ae85b9c8789536c84606532d41deed7b1c02cf7c
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 2 20:45:53 2025 +0200
docs-xml/smbdotconf: change 'smb ports' into a synonym for 'server smb transport'
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 50c25dc6634c56904bac5fdd0d9b89574cd13815
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 16:55:19 2025 +0200
ctdb:events: let 50.samba.script use 'server smb transports'
We can't only use 'server smb transports' as in ci runs
the 'testparm' binary is from the distribution and likely
be in older Samba version.
So we still fallback to 'smb ports'.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit cbcc94be5430fee6661c48e5e67df8862cca2cd6
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 16:55:19 2025 +0200
ctdb:events: let 50.samba.script normalize the transports to tcp ports
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 5fc5218257c3b1031781bf0da03ab4424fb73c40
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 15:39:40 2025 +0200
s3:smbd: setup parent->transports from 'server smb transports'
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit c7787dd358019515ff66fbc66c9ffd0dfff327c9
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 13:43:46 2025 +0200
s4:smb_server: make use of lpcfg_server_smb_transports() in smbsrv_add_socket()
Here we still only support tcp and nbt...
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 6a835ec933d3c36707b57f77611b99c2cbb39e4a
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 2 20:45:53 2025 +0200
docs-xml/smbdotconf: add 'server smb transport' option
In the next commits 'smb ports' will become just
a synonym for 'server smb transport'...
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit b1a7324139044d4530c73c06f97b59090e01c586
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 15:02:57 2025 +0200
s4:torture: map --smb-ports option to 'client smb transports'
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 28ee01778f8e88b0c9184484b6a0a6d3125f00a8
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 12:26:48 2025 +0200
s4:param: let lpcfg_smbcli_options() use lpcfg_client_smb_transports()
It means we'll use 'client smb transports' instead of 'smb ports'
for the client side.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit da9cb652140481bfcc219441d7ee679954d5b3be
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 2 21:03:22 2025 +0200
docs-xml/smbdotconf: add 'client smb transports' option
This will replace the use of 'smb ports' for source4 clients.
In future it will be used for all smb client connections
and it will allow to add other transports as 'quic' or 'smbdirect.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit f486a9c93d1a84cb98bde4079bd881aa7fd10597
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 13:43:46 2025 +0200
s4:smb_server: make use of smb_transports_parse() in smbsrv_add_socket()
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 at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 25a0d9fd5fe055f183c45dc13d5ce0ea3c01015e
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 16:10:58 2025 +0200
s3:smbd: use parent->transports instead of 'smb ports' strings
This will simplify adding new transports as 'quic' or 'smbdirect'
in future.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 1f3f8c4a6ba837e24e7a12193415c70140a1cb28
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 15:39:40 2025 +0200
s3:smbd: setup parent->transports from 'smb ports'
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 at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 5b47f2adf2a1a7c131341a6f51adc5702fd730dd
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 15:15:33 2025 +0200
s3:smbd: let open_sockets_smbd() use smbd_open_socket_for_ip()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit e6bd60ac3fb7236f63ea26ce2cda58f85986bed1
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 15:07:05 2025 +0200
s3:smbd: remove unused msg_ctx argument from smbd_open_socket_for_ip()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 162156057b1223ced73ef9197b9dc2ff69d53a7e
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 14:47:13 2025 +0200
s3:smbd: let smbd_open_socket_for_ip() return the number of successful binds
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit f35aa7ecc00c833bb34dfac0ff9e477b1be13b2b
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 14:42:44 2025 +0200
s3:smbd: simplify binding to wildcard addresses
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit b8d76d07393cd7ca1db30440f91aa8c9ee26235e
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 14:37:02 2025 +0200
s3:smbd: only do dns_port logic in one central place.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit c4d931255cfa23215114fd95fdb85bc62e6f66b2
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 14:33:14 2025 +0200
s3:smbd: remove unused dns_port variable from smbd_open_socket_for_ip()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 9b0e254738f517d5d003e31527e4d4c6209e132d
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 15:23:48 2025 +0200
s3:smbd: let smbd_{addr_changed,close_socket_for_ip}() use samba_sockaddr to avoid strict-aliasing warnings
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit baec5eb146cb7eb28813e26e2ca9a1338ae05f00
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 13:50:47 2025 +0200
s3:smbd: let smbd_accept_connection() use samba_sockaddr to avoid strict-aliasing warnings
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit cecc68f66558b5fd50c73f84f7e5c9aa277fba2a
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:56:13 2025 +0200
s4:client: remove unused ports from do_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit fda0f2e71a2767a887d077e8f6be74426bb32447
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:55:00 2025 +0200
s4:torture: remove unused ports from masktests.c
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit cbc8aa2e51b46f3efc9199e8c0aa79ed48a41558
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:53:35 2025 +0200
s4:client: remove unused ports from cifsdd* functions
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 45d58ef5f8e1303e1bb7a4bb30f16d654aa87661
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:49:30 2025 +0200
s4:libcli: remove unused ports from smbcli_full_connection()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 3a39c6157a335ca5c58728f8e9ab7d64e0ee9fa4
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:41:59 2025 +0200
s4:client: remove unused destports from do_message_op()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit cde54286e35965dc8c0d32bc3d7cc5c80bbff057
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:40:51 2025 +0200
s4:libcli: remove unused ports from smbcli_socket_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit aa13d3f9b6916c17bdc9b89d05bb97190dc8e03f
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:38:15 2025 +0200
s4:libcli: remove unused dest_ports from smbcli_tree_full_connection()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 82c10a6b6a57d34c2c8c06f8adcb5843fddb79ba
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:35:05 2025 +0200
s4:libcli: remove unused dest_ports struct smb_composite_fsinfo
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit b35610f990fae4c99c2be9f63fdf2383f10f216f
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:33:32 2025 +0200
s4:libcli: remove unused ports from struct smb_composite_fetchfile
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 770769929d6f5c13288c1dd1023bdaf7a5bd5a5a
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:31:05 2025 +0200
s4:torture/raw: remove unused dest_port handling from openbench.c
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 8408f0d6124d2db5ddc271ec64a20df0b7138491
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:28:26 2025 +0200
s4:libcli: remove unused dest_ports from struct smb_composite_connect
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit a78e777b2a95de4246069c305ab2d715613e7611
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 10:21:42 2025 +0200
s4:libcli: remove unused ports from smb2_connect()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 9dbb29138ae94629ef3984b71bec0fd44914bb91
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 08:46:27 2025 +0200
s4:libcli: remove unused ports argument from smb2_connect_ext()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 8f7e8aa35e49245c04afebb37942bbc2fee2687f
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 08:44:24 2025 +0200
s4:libcli: remove unused ports argument from smb2_connect_send
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit a8a1c86cf4ec20e5730c94148961a1381e87bbfc
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 08:40:24 2025 +0200
s4:libcli: remove unused dest_ports from smb_connect_nego_send()
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 5277e326012ea1bf90a944b6d5d4ed839f301bfc
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Apr 3 08:35:40 2025 +0200
s4:libcli: pass struct smbcli_options to smbcli_sock_connect() instead of port strings
This allows us to build the ports array from options.transports.
Pair-Programmed-With: Ralph Boehme <slow at samba.org>
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 77055eada7c61933b9e3073041497d882643a523
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 2 21:14:10 2025 +0200
s4:libcli: introduce smbcli_options.transports based on lpcfg_smb_ports()
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 at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 43a5fd564ca2efd59b07416ef36c4f7defb9ce53
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 2 19:51:50 2025 +0200
libcli/smb: add struct smb_transports infrastructure
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 at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
commit 5889e43c40c85f428b3a7437a613c7c8bac807db
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Apr 2 19:16:48 2025 +0200
s4:libcli/smb_composite: remove unused struct smb_composite_connectmulti
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events/legacy/50.samba.script | 21 +-
docs-xml/manpages/smb.conf.5.xml | 2 +-
.../smbdotconf/protocol/clientsmbtransports.xml | 33 ++
.../smbdotconf/protocol/serversmbtransports.xml | 48 +++
docs-xml/smbdotconf/protocol/smbports.xml | 11 -
examples/fuse/smb2mount.c | 11 +-
examples/winexe/winexe.c | 15 +-
lib/param/loadparm.c | 135 +++++-
lib/param/param.h | 2 +-
lib/util/attr.h | 4 +-
libcli/smb/smb_util.h | 20 +
libcli/smb/util.c | 55 +++
libcli/util/errmap_unix.c | 3 +
python/samba/tests/docs.py | 4 +-
source3/client/client.c | 28 +-
source3/client/smbspool.c | 20 +-
source3/include/proto.h | 52 +--
source3/lib/errmap_unix.c | 3 +
source3/lib/netapi/cm.c | 5 +-
source3/lib/util_sock.c | 147 ++-----
source3/libnet/libnet_join.c | 15 +-
source3/librpc/idl/smbXsrv.idl | 2 +
source3/libsmb/cliconnect.c | 59 ++-
source3/libsmb/clidfs.c | 21 +-
source3/libsmb/libsmb_server.c | 41 +-
source3/libsmb/passchange.c | 5 +-
source3/libsmb/proto.h | 28 +-
source3/libsmb/pylibsmb.c | 28 +-
source3/libsmb/smbsock_connect.c | 412 +++++++++++++-----
source3/libsmb/smbsock_connect.h | 73 ++++
source3/nmbd/nmbd_synclists.c | 4 +-
source3/param/loadparm.c | 3 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 5 +-
source3/rpcclient/cmd_spoolss.c | 5 +-
source3/rpcclient/rpcclient.c | 5 +-
source3/smbd/globals.h | 2 +
source3/smbd/proto.h | 3 +-
source3/smbd/server.c | 295 +++++++------
source3/smbd/smb2_process.c | 11 +-
source3/smbd/smbXsrv_client.c | 2 +
source3/smbd/smbXsrv_session.c | 1 +
source3/torture/locktest2.c | 5 +-
source3/torture/test_smbsock_any_connect.c | 15 +-
source3/torture/torture.c | 27 +-
source3/utils/mdsearch.c | 6 +-
source3/utils/net_ads.c | 5 +-
source3/utils/net_rpc.c | 5 +-
source3/utils/net_time.c | 5 +-
source3/utils/net_util.c | 7 +-
source3/utils/netlookup.c | 5 +-
source3/utils/smbcacls.c | 5 +-
source3/utils/smbcquotas.c | 5 +-
source3/utils/status_json.c | 28 ++
source3/utils/wspsearch.c | 6 +-
source3/winbindd/winbindd_cm.c | 27 +-
source4/client/cifsdd.c | 10 +-
source4/client/cifsdd.h | 1 -
source4/client/cifsddio.c | 10 +-
source4/client/client.c | 22 +-
source4/ldap_server/ldap_server.c | 28 +-
source4/lib/policy/gp_filesys.c | 2 +-
source4/lib/tls/tls.h | 4 +
source4/lib/tls/tls_tstream.c | 23 +
source4/libcli/cliconnect.c | 14 +-
source4/libcli/libcli.h | 4 +-
source4/libcli/raw/clisocket.c | 464 +++++++--------------
source4/libcli/raw/clitransport.c | 7 +-
source4/libcli/raw/clitree.c | 6 +-
source4/libcli/raw/libcliraw.h | 8 +-
source4/libcli/smb2/connect.c | 21 +-
source4/libcli/smb2/transport.c | 7 +-
source4/libcli/smb_composite/connect.c | 7 +-
source4/libcli/smb_composite/connect_nego.c | 14 +-
source4/libcli/smb_composite/fetchfile.c | 11 +-
source4/libcli/smb_composite/fsinfo.c | 19 +-
source4/libcli/smb_composite/smb_composite.h | 34 +-
source4/libcli/wscript_build | 2 +-
source4/librpc/rpc/dcerpc_connect.c | 8 +-
source4/ntvfs/cifs/vfs_cifs.c | 2 +-
source4/param/loadparm.c | 2 +
source4/smb_server/smb_server.c | 34 +-
source4/torture/basic/base.c | 3 +-
source4/torture/basic/misc.c | 3 +-
source4/torture/gentest.c | 4 +-
source4/torture/locktest.c | 4 +-
source4/torture/masktest.c | 12 +-
source4/torture/raw/composite.c | 7 +-
source4/torture/raw/lockbench.c | 2 +-
source4/torture/raw/openbench.c | 10 +-
source4/torture/raw/oplock.c | 2 +-
source4/torture/raw/session.c | 2 +-
source4/torture/raw/tconrate.c | 3 +-
source4/torture/rpc/fsrvp.c | 6 +-
source4/torture/rpc/iremotewinspool_driver.c | 2 +-
source4/torture/rpc/join.c | 4 +-
source4/torture/rpc/samba3rpc.c | 40 +-
source4/torture/rpc/spoolss.c | 4 +-
source4/torture/smb2/credits.c | 14 +-
source4/torture/smb2/ioctl.c | 4 +-
source4/torture/smb2/multichannel.c | 6 +-
source4/torture/smb2/oplock.c | 4 +-
source4/torture/smb2/replay.c | 16 +-
source4/torture/smb2/scan.c | 4 +-
source4/torture/smb2/session.c | 32 +-
source4/torture/smb2/util.c | 4 +-
source4/torture/smbtorture.c | 2 +-
source4/torture/unix/unix_info2.c | 2 +-
source4/torture/unix/whoami.c | 5 +-
source4/torture/util_smb.c | 2 +-
109 files changed, 1655 insertions(+), 1102 deletions(-)
create mode 100644 docs-xml/smbdotconf/protocol/clientsmbtransports.xml
create mode 100644 docs-xml/smbdotconf/protocol/serversmbtransports.xml
delete mode 100644 docs-xml/smbdotconf/protocol/smbports.xml
create mode 100644 source3/libsmb/smbsock_connect.h
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events/legacy/50.samba.script b/ctdb/config/events/legacy/50.samba.script
index 41864d59e80..7da0c399d59 100755
--- a/ctdb/config/events/legacy/50.samba.script
+++ b/ctdb/config/events/legacy/50.samba.script
@@ -149,7 +149,22 @@ list_samba_shares()
list_samba_ports()
{
- testparm_get "smb ports"
+ {
+ testparm_get "server smb transports"
+ testparm_get "smb ports"
+ # only | head -1 would cause a broken pipe for the 2nd command
+ } | head -2 | head -1
+}
+
+normalize_transports_to_tcp_ports()
+{
+ echo "$1" | sed \
+ -e 's!,! !g' \
+ -e 's!\<tcp\>:!!g' \
+ -e 's!\<tcp\>!445!g' \
+ -e 's!\<nbt\>:!!g' \
+ -e 's!\<nbt\>!139!g' \
+ -e 's!\<[a-zA-Z][^ ]*!!g'
}
###########################
@@ -172,9 +187,11 @@ monitor)
smb_ports=$(list_samba_ports)
[ -n "$smb_ports" ] || die "Failed to set smb ports"
fi
+ smb_tcp_ports=$(normalize_transports_to_tcp_ports "$smb_ports")
+ [ -n "$smb_tcp_ports" ] || die "Failed to set smb tcp ports"
# Intentionally unquoted multi-word value here
# shellcheck disable=SC2086
- ctdb_check_tcp_ports $smb_ports || exit $?
+ ctdb_check_tcp_ports $smb_tcp_ports || exit $?
if [ "$CTDB_SAMBA_SKIP_SHARE_CHECK" != "yes" ]; then
list_samba_shares | ctdb_check_directories || exit $?
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 3a5a73dc959..63da507a399 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -480,7 +480,7 @@ chmod 1770 /usr/local/samba/lib/usershares
<para>This parameter is not available when Samba listens on port 445, as clients no longer
send this information. If you use this macro in an include statement on a domain that has
- a Samba domain controller be sure to set in the [global] section <parameter>smb ports =
+ a Samba domain controller be sure to set in the [global] section <parameter>server smb transports =
139</parameter>. This will cause Samba to not listen on port 445 and will permit include
functionality to function as it did with Samba 2.x.
</para></listitem>
diff --git a/docs-xml/smbdotconf/protocol/clientsmbtransports.xml b/docs-xml/smbdotconf/protocol/clientsmbtransports.xml
new file mode 100644
index 00000000000..18adad501d6
--- /dev/null
+++ b/docs-xml/smbdotconf/protocol/clientsmbtransports.xml
@@ -0,0 +1,33 @@
+<samba:parameter name="client smb transports"
+ context="G"
+ type="list"
+ handler="handle_client_smb_transports"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>Specifies which transports and ports the client should try to connect to for SMB traffic.</para>
+
+ <para>The order matters as they are tried in order with short delays for the fallbacks.</para>
+
+ <para>The transport 'tcp' uses raw tcp with a 4 byte length header per SMB PDU.
+ The default port for 'tcp' is 445. Other ports can be specified by adding it
+ after ':', e.g. 'tcp:1445'.
+ </para>
+
+ <para>The transport 'nbt' uses netbios framing on top of tcp per SMB PDU.
+ The default port for 'nbt' is 139. Other ports can be specified by adding it
+ after ':', e.g. 'nbt:1139'.
+ </para>
+
+ <para>Numerical ports are handled as 'tcp' except port '139' is handled as 'nbt'.
+ </para>
+
+ <para>Note that's currently a limit of 10 unique transports, all others will
+ be ignored.</para>
+</description>
+
+<value type="example">445</value>
+<value type="example">tcp, tcp:1445</value>
+<value type="example">8000, nbt:1139</value>
+
+<value type="default">tcp, nbt</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/serversmbtransports.xml b/docs-xml/smbdotconf/protocol/serversmbtransports.xml
new file mode 100644
index 00000000000..83a4c62ddc0
--- /dev/null
+++ b/docs-xml/smbdotconf/protocol/serversmbtransports.xml
@@ -0,0 +1,48 @@
+<samba:parameter name="server smb transports"
+ context="G"
+ type="list"
+ handler="handle_server_smb_transports"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>Specifies which transports and ports the server should listen on for SMB traffic.</para>
+
+ <para>The order matters only for mDNS registrations, the first
+ 'tcp' or 'nbt' port is used for that.</para>
+
+ <para>The transport 'tcp' uses raw tcp with a 4 byte length header per SMB PDU.
+ The default port for 'tcp' is 445. Other ports can be specified by adding it
+ after ':', e.g. 'tcp:1445'.
+ </para>
+
+ <para>The transport 'nbt' uses netbios framing on top of tcp per SMB PDU.
+ The default port for 'nbt' is 139. Other ports can be specified by adding it
+ after ':', e.g. 'nbt:1139'.
+ </para>
+
+ <para>Numerical ports are handled as 'tcp' except port '139' is handled as 'nbt'.
+ </para>
+
+ <para>Note that's currently a limit of 10 unique transports, all others will
+ be ignored.</para>
+</description>
+
+<value type="example">445</value>
+<value type="example">tcp, tcp:1445</value>
+<value type="example">8000, nbt:1139</value>
+
+<value type="default">tcp, nbt</value>
+</samba:parameter>
+
+<samba:parameter name="smb ports"
+ context="G"
+ type="list"
+ handler="handle_server_smb_transports"
+ function="server_smb_transports"
+ synonym="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ This is a synonym for <smbconfoption name="server smb transports"/>.
+ </para>
+</description>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smbports.xml b/docs-xml/smbdotconf/protocol/smbports.xml
deleted file mode 100644
index ec1df6555be..00000000000
--- a/docs-xml/smbdotconf/protocol/smbports.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<samba:parameter name="smb ports"
- context="G"
- type="cmdlist"
- handler="handle_smb_ports"
- xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
-<description>
- <para>Specifies which ports the server should listen on for SMB traffic.</para>
-</description>
-
-<value type="default">445 139</value>
-</samba:parameter>
diff --git a/examples/fuse/smb2mount.c b/examples/fuse/smb2mount.c
index 69c14af9df1..0c97f32846c 100644
--- a/examples/fuse/smb2mount.c
+++ b/examples/fuse/smb2mount.c
@@ -24,10 +24,12 @@
#include "lib/param/param.h"
#include "client.h"
#include "libsmb/proto.h"
+#include "libsmb/smbsock_connect.h"
#include "clifuse.h"
static struct cli_state *connect_one(struct cli_credentials *creds,
- const char *server, int port,
+ const char *server,
+ const struct smb_transports *transports,
const char *share)
{
struct cli_state *c = NULL;
@@ -39,7 +41,7 @@ static struct cli_state *connect_one(struct cli_credentials *creds,
lp_netbios_name(),
server,
NULL,
- port,
+ transports,
share,
"?????",
creds,
@@ -64,6 +66,7 @@ int main(int argc, char *argv[])
char *unc, *mountpoint, *server, *share;
struct cli_state *cli;
struct cli_credentials *creds = NULL;
+ struct smb_transports ts = { .num_transports = 0, };
bool ok;
struct poptOption long_options[] = {
@@ -149,7 +152,9 @@ int main(int argc, char *argv[])
creds = samba_cmdline_get_creds();
- cli = connect_one(creds, server, port, share);
+ ts = smbsock_transports_from_port(port);
+
+ cli = connect_one(creds, server, &ts, share);
if (cli == NULL) {
return -1;
}
diff --git a/examples/winexe/winexe.c b/examples/winexe/winexe.c
index 774d07a14d0..a296572eaae 100644
--- a/examples/winexe/winexe.c
+++ b/examples/winexe/winexe.c
@@ -32,6 +32,7 @@
#include "librpc/gen_ndr/ndr_svcctl_c.h"
#include "rpc_client/cli_pipe.h"
#include "libcli/smb/smbXcli_base.h"
+#include "libsmb/smbsock_connect.h"
#include "libcli/util/werror.h"
#include "lib/async_req/async_sock.h"
#include "lib/cmdline/cmdline.h"
@@ -282,7 +283,7 @@ static void parse_args(int argc, const char *argv[],
static NTSTATUS winexe_svc_upload(
const char *hostname,
- int port,
+ const struct smb_transports *transports,
const char *service_filename,
const DATA_BLOB *svc32_exe,
const DATA_BLOB *svc64_exe,
@@ -300,7 +301,7 @@ static NTSTATUS winexe_svc_upload(
NULL,
hostname,
NULL,
- port,
+ transports,
"ADMIN$",
"?????",
credentials,
@@ -385,7 +386,7 @@ done:
static NTSTATUS winexe_svc_install(
struct cli_state *cli,
const char *hostname,
- int port,
+ const struct smb_transports *transports,
const char *service_name,
const char *service_filename,
const DATA_BLOB *svc32_exe,
@@ -600,7 +601,7 @@ static NTSTATUS winexe_svc_install(
if (need_start) {
status = winexe_svc_upload(
hostname,
- port,
+ transports,
service_filename,
svc32_exe,
svc64_exe,
@@ -1836,6 +1837,7 @@ int main(int argc, char *argv[])
#else
const DATA_BLOB *winexesvc64_exe = NULL;
#endif
+ struct smb_transports ts;
NTSTATUS status;
int ret = 1;
int return_code = 0;
@@ -1857,13 +1859,14 @@ int main(int argc, char *argv[])
goto done;
}
+ ts = smbsock_transports_from_port(options.port);
status = cli_full_connection_creds(
talloc_tos(),
&cli,
lp_netbios_name(),
options.hostname,
NULL,
- options.port,
+ &ts,
"IPC$",
"IPC",
options.credentials,
@@ -1878,7 +1881,7 @@ int main(int argc, char *argv[])
status = winexe_svc_install(
cli,
options.hostname,
- options.port,
+ &ts,
service_name,
service_filename,
winexesvc32_exe,
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 30a45511cb8..35a718441de 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -67,6 +67,7 @@
#include "lib/param/s3_param.h"
#include "lib/util/bitmap.h"
#include "libcli/smb/smb_constants.h"
+#include "libcli/smb/smb_util.h"
#include "tdb.h"
#include "librpc/gen_ndr/nbt.h"
#include "librpc/gen_ndr/dns.h"
@@ -1341,41 +1342,126 @@ bool handle_idmap_gid(struct loadparm_context *lp_ctx, struct loadparm_service *
return lpcfg_string_set(lp_ctx->globals->ctx, ptr, pszParmValue);
}
-bool handle_smb_ports(struct loadparm_context *lp_ctx, struct loadparm_service *service,
- const char *pszParmValue, char **ptr)
+bool smb_transport_parse(const char *_value, struct smb_transport *_t)
+{
+ size_t _value_len = strlen(_value);
+ char value[_value_len+1];
+ const char *vparam = NULL;
+ const char *portstr = NULL;
+ char *p = NULL;
+ struct smb_transport t = {
+ .type = SMB_TRANSPORT_TYPE_UNKNOWN,
+ };
+ bool invalid = false;
+
+ memcpy(value, _value, sizeof(value));
+
+ p = strchr(value, ':');
+ if (p != NULL) {
+ vparam = p + 1;
+ p[0] = '\0';
+ }
+
+ if (strcmp("tcp", value) == 0) {
+ t.type = SMB_TRANSPORT_TYPE_TCP;
+ t.port = 445;
+ } else if (strcmp("nbt", value) == 0) {
+ t.type = SMB_TRANSPORT_TYPE_NBT;
+ t.port = 139;
+ } else if (vparam != NULL) {
+ /*
+ * a port number should not have
+ * extra parameter!
+ */
+ invalid = true;
+ } else {
+ /*
+ * Could a port number only
+ */
+ portstr = value;
+ }
+
+ if (!invalid && portstr == NULL) {
+ portstr = vparam;
+ }
+
+ if (portstr != NULL) {
+ char *_end = NULL;
+ int _port = 0;
+ _port = strtol(portstr, &_end, 10);
+ if (*_end != '\0' || _port <= 0 || _port > 65535) {
+ invalid = true;
+ } else {
+ t.port = _port;
+ }
+ }
+
+ if (invalid) {
+ t = (struct smb_transport) {
+ .type = SMB_TRANSPORT_TYPE_UNKNOWN,
+ };
+
+ *_t = t;
+ return false;
+ }
+
+ if (t.type == SMB_TRANSPORT_TYPE_UNKNOWN) {
+ if (t.port == 139) {
+ t.type = SMB_TRANSPORT_TYPE_NBT;
+ } else {
+ t.type = SMB_TRANSPORT_TYPE_TCP;
+ }
+ }
+
+ *_t = t;
+ return true;
+}
+
+static bool handle_smb_transports(struct loadparm_context *lp_ctx,
+ struct loadparm_service *service,
+ const char *pszParmValue,
+ char **ptr,
+ const char *optname)
{
+ const char **list = NULL;
static int parm_num = -1;
- int i;
- const char **list;
+ size_t i;
+ bool ok;
if (!pszParmValue || !*pszParmValue) {
return false;
}
if (parm_num == -1) {
- parm_num = lpcfg_map_parameter("smb ports");
+ parm_num = lpcfg_map_parameter(optname);
if (parm_num == -1) {
return false;
}
}
- if (!set_variable_helper(lp_ctx->globals->ctx, parm_num, ptr, "smb ports",
- pszParmValue)) {
+ ok = set_variable_helper(lp_ctx->globals->ctx,
+ parm_num,
+ ptr,
+ optname,
+ pszParmValue);
+ if (!ok) {
return false;
}
- list = lp_ctx->globals->smb_ports;
+ list = *(const char ***)ptr;
+
if (list == NULL) {
return false;
}
- /* Check that each port is a valid integer and within range */
+ /* Check that each transport is a valid */
for (i = 0; list[i] != NULL; i++) {
- char *end = NULL;
- int port = 0;
- port = strtol(list[i], &end, 10);
- if (*end != '\0' || port <= 0 || port > 65535) {
- TALLOC_FREE(list);
+ struct smb_transport t = {
+ .type = SMB_TRANSPORT_TYPE_UNKNOWN,
+ };
+
+ ok = smb_transport_parse(list[i], &t);
+ if (!ok) {
return false;
}
}
@@ -1383,6 +1469,24 @@ bool handle_smb_ports(struct loadparm_context *lp_ctx, struct loadparm_service *
return true;
}
+bool handle_client_smb_transports(struct loadparm_context *lp_ctx,
+ struct loadparm_service *service,
+ const char *pszParmValue,
+ char **ptr)
+{
+ return handle_smb_transports(lp_ctx, service, pszParmValue, ptr,
+ "client smb transports");
+}
+
+bool handle_server_smb_transports(struct loadparm_context *lp_ctx,
+ struct loadparm_service *service,
+ const char *pszParmValue,
+ char **ptr)
+{
+ return handle_smb_transports(lp_ctx, service, pszParmValue, ptr,
+ "server smb transports");
+}
+
bool handle_rpc_server_dynamic_port_range(struct loadparm_context *lp_ctx,
struct loadparm_service *service,
const char *pszParmValue,
@@ -2837,7 +2941,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "use mmap", "True");
- lpcfg_do_global_parameter(lp_ctx, "smb ports", "445 139");
+ lpcfg_do_global_parameter(lp_ctx, "server smb transports", "tcp, nbt");
+ lpcfg_do_global_parameter(lp_ctx, "client smb transports", "tcp, nbt");
lpcfg_do_global_parameter_var(lp_ctx, "nbt port", "%d", NBT_NAME_SERVICE_PORT);
lpcfg_do_global_parameter_var(lp_ctx, "dgram port", "%d", NBT_DGRAM_SERVICE_PORT);
lpcfg_do_global_parameter(lp_ctx, "krb5 port", "88");
diff --git a/lib/param/param.h b/lib/param/param.h
index 02a21280d80..ef678a1cbd6 100644
--- a/lib/param/param.h
+++ b/lib/param/param.h
@@ -47,6 +47,7 @@ struct loadparm_context;
struct loadparm_service;
struct smbcli_options;
struct smbcli_session_options;
+struct smb_transport;
struct gensec_settings;
struct bitmap;
struct file_lists;
@@ -186,7 +187,6 @@ void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
struct smbcli_options *options);
void lpcfg_smbcli_session_options(struct loadparm_context *lp_ctx,
struct smbcli_session_options *options);
-const char **lpcfg_smb_ports(struct loadparm_context *);
const char *lpcfg_socket_options(struct loadparm_context *);
struct dcerpc_server_info *lpcfg_dcerpc_server_info(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
struct gensec_settings *lpcfg_gensec_settings(TALLOC_CTX *, struct loadparm_context *);
diff --git a/lib/util/attr.h b/lib/util/attr.h
--
Samba Shared Repository
More information about the samba-cvs
mailing list