From: Stefan Metzmacher Date: Wed, 2 Apr 2025 18:45:53 +0000 (+0200) Subject: docs-xml/smbdotconf: change 'smb ports' into a synonym for 'server smb transport' X-Git-Tag: tevent-0.17.0~285 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae85b9c8789536c84606532d41deed7b1c02cf7c;p=thirdparty%2Fsamba.git docs-xml/smbdotconf: change 'smb ports' into a synonym for 'server smb transport' Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke --- 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 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 smb ports = + a Samba domain controller be sure to set in the [global] section server smb transports = 139. This will cause Samba to not listen on port 445 and will permit include functionality to function as it did with Samba 2.x. diff --git a/docs-xml/smbdotconf/protocol/serversmbtransports.xml b/docs-xml/smbdotconf/protocol/serversmbtransports.xml index f50afd34438..83a4c62ddc0 100644 --- a/docs-xml/smbdotconf/protocol/serversmbtransports.xml +++ b/docs-xml/smbdotconf/protocol/serversmbtransports.xml @@ -32,3 +32,17 @@ tcp, nbt + + + + + This is a synonym for . + + + 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 @@ - - - Specifies which ports the server should listen on for SMB traffic. - - -445 139 - diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 29f7c75048d..35a718441de 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -1342,48 +1342,6 @@ 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) -{ - static int parm_num = -1; - int i; - const char **list; - - if (!pszParmValue || !*pszParmValue) { - return false; - } - - if (parm_num == -1) { - parm_num = lpcfg_map_parameter("smb ports"); - if (parm_num == -1) { - return false; - } - } - - if (!set_variable_helper(lp_ctx->globals->ctx, parm_num, ptr, "smb ports", - pszParmValue)) { - return false; - } - - list = lp_ctx->globals->smb_ports; - if (list == NULL) { - return false; - } - - /* Check that each port is a valid integer and within range */ - 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); - return false; - } - } - - return true; -} - bool smb_transport_parse(const char *_value, struct smb_transport *_t) { size_t _value_len = strlen(_value); @@ -2985,7 +2943,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) 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(lp_ctx, "smb ports", "445 139"); 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 2b96c56067a..ef678a1cbd6 100644 --- a/lib/param/param.h +++ b/lib/param/param.h @@ -187,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/python/samba/tests/docs.py b/python/samba/tests/docs.py index e52a97ed629..336299a4fac 100644 --- a/python/samba/tests/docs.py +++ b/python/samba/tests/docs.py @@ -271,7 +271,6 @@ class SmbDotConfTests(TestCase): exceptions = ['client lanman auth', 'client plaintext auth', 'registry shares', - 'smb ports', 'rpc server dynamic port range', 'name resolve order', 'clustering']) @@ -281,8 +280,7 @@ class SmbDotConfTests(TestCase): self._test_default(['bin/samba-tool', 'testparm']) self._set_defaults(['bin/samba-tool', 'testparm']) self._set_arbitrary(['bin/samba-tool', 'testparm'], - exceptions=['smb ports', - 'rpc server dynamic port range', + exceptions=['rpc server dynamic port range', 'name resolve order']) self._test_empty(['bin/samba-tool', 'testparm']) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index a27521cf002..949e40c36ff 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -847,7 +847,6 @@ void loadparm_s3_init_globals(struct loadparm_context *lp_ctx, Globals.server_signing = SMB_SIGNING_DEFAULT; Globals.defer_sharing_violations = true; - Globals.smb_ports = str_list_make_v3_const(NULL, SMB_PORTS, NULL); Globals.server_smb_transports = str_list_make_v3_const(NULL, "tcp, nbt", NULL); Globals.client_smb_transports = str_list_make_v3_const(NULL, "tcp, nbt", NULL);