sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-18 06:04:06 +03:00
Code

smbd: bring back "smb3 unix extensions" option

Browse Source 
This basically reverts commit b3cae8dcf192f65031f143e5bb9135c895611d98
with a few important differences:

* SMB3 UNIX extensions are always built, but disabled by default at runtime.

* They are globally enabled in the fileserver test environment.

* It's now a per-share option, so admins can selectively disable them
  on a per-share basis. This allows clients to detect early that a share
  doesn't support user mount requested POSIX and fail appropiately, passing
  the failure to the requesting application (mount command).

Signed-off-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Ralph Boehme 2023-11-08 17:49:19 +01:00 committed by Jeremy Allison
parent b124c2e182
commit 631e6aa0d0
6 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WHATSNEW.txt
View File

@ -57,7 +57,7 @@ smb.conf changes
Parameter Name Description Default
-------------- ----------- -------
smb3 unix extensions removed always offered
smb3 unix extensions Per share -
KNOWN ISSUES

9
docs-xml/smbdotconf/protocol/smb3unixextensions.xml Normal file
View File

@ -0,0 +1,9 @@
<samba:parameter name="smb3 unix extensions"
context="S"
type="boolean"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>Experimental SMB 3.1.1 Unix Extensions.</para>
</description>
<value type="default">no</value>
</samba:parameter>

1
selftest/target/Samba3.pm
View File

@ -1855,6 +1855,7 @@ sub setup_fileserver
my $ip4 = Samba::get_ipv4_addr("FILESERVER");
my $fileserver_options = "
smb3 unix extensions = yes
kernel change notify = yes
spotlight backend = elasticsearch
elasticsearch:address = $ip4

8
source3/param/loadparm.c
View File

@ -4680,6 +4680,12 @@ void widelinks_warning(int snum)
"These parameters are incompatible. "
"Wide links will be disabled for this share.\n",
lp_const_servicename(snum));
} else if (lp_smb3_unix_extensions(snum)) {
DBG_ERR("Share '%s' has wide links and SMB3 Unix "
"extensions enabled. "
"These parameters are incompatible. "
"Wide links will be disabled for this share.\n",
lp_const_servicename(snum));
}
}
}
@ -4687,7 +4693,7 @@ void widelinks_warning(int snum)
bool lp_widelinks(int snum)
{
/* wide links is always incompatible with unix extensions */
if (lp_smb1_unix_extensions()) {
if (lp_smb1_unix_extensions() || lp_smb3_unix_extensions(snum)) {
/*
* Unless we have "allow insecure widelinks"
* turned on.

4
source3/smbd/smb2_create.c
View File

@ -736,7 +736,9 @@ static NTSTATUS smbd_smb2_create_fetch_create_ctx(
state->svhdx = smb2_create_blob_find(
in_context_blobs, SVHDX_OPEN_DEVICE_CONTEXT);
}
if (xconn->smb2.server.posix_extensions_negotiated) {
if (xconn->smb2.server.posix_extensions_negotiated &&
lp_smb3_unix_extensions(SNUM(state->smb1req->conn)))
{
/*
* Negprot only allowed this for proto>=3.11
*/

4
source3/smbd/smb2_negprot.c
View File

@ -142,6 +142,10 @@ static NTSTATUS smb2_negotiate_context_process_posix(
*posix = false;
if (!lp_smb3_unix_extensions(GLOBAL_SECTION_SNUM)) {
return NT_STATUS_OK;
}
in_posix = smb2_negotiate_context_find(in_c,
SMB2_POSIX_EXTENSIONS_AVAILABLE);
if (in_posix == NULL) {