The branch, v4-18-test has been updated
via c4968128b7f smbclient: Fix fd leak with "showacls;ls"
via d49f9f4be7d smbd: remove comments about deprecated 'write cache
size'
from 3662ddaadc9 libsmb: Fix directory listing against old servers
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-18-test
- Log -----------------------------------------------------------------
commit c4968128b7f2c75aa96eb7e446719d766950ef58
Author: Volker Lendecke <v...@samba.org>
Date: Thu Jun 8 10:14:18 2023 +0200
smbclient: Fix fd leak with "showacls;ls"
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15391
Signed-off-by: Volker Lendecke <v...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Thu Jun 8 16:55:14 UTC 2023 on atb-devel-224
(cherry picked from commit 5c52f71c0d0e162dcbf42378357313035efa860f)
Autobuild-User(v4-18-test): Jule Anger <jan...@samba.org>
Autobuild-Date(v4-18-test): Mon Jun 12 08:25:18 UTC 2023 on atb-devel-224
commit d49f9f4be7d825153026b2f63101fd89baa40ceb
Author: Jones Syue <joness...@qnap.com>
Date: Fri Jun 2 14:40:09 2023 +0800
smbd: remove comments about deprecated 'write cache size'
The option 'write cache size' was removed since samba-4.12 version:
https://wiki.samba.org/index.php/Samba_4.12_Features_added/changed
https://git.samba.org/?p=samba.git;a=commit;h=3fea05e0
https://git.samba.org/?p=samba.git;a=commit;h=728fabea
It is supposed to remove comments about deprecated 'write cache size',
in order to avoid confusion when reading source code and documents.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15383
Signed-off-by: Jones Syue <joness...@qnap.com>
Reviewed-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Fri Jun 2 09:48:17 UTC 2023 on atb-devel-224
(cherry picked from commit 9c24f853a84e1435235ba58ffcaaeff7dd80f6aa)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/locking/smb2leases.xml | 2 --
docs-xml/smbdotconf/tuning/aioreadsize.xml | 2 +-
docs-xml/smbdotconf/tuning/aiowritesize.xml | 2 +-
source3/client/client.c | 1 +
source3/smbd/smb2_read.c | 1 -
5 files changed, 3 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/locking/smb2leases.xml
b/docs-xml/smbdotconf/locking/smb2leases.xml
index 5a490875af7..89ff307d8f9 100644
--- a/docs-xml/smbdotconf/locking/smb2leases.xml
+++ b/docs-xml/smbdotconf/locking/smb2leases.xml
@@ -15,8 +15,6 @@
and <smbconfoption name="kernel oplocks">no</smbconfoption>.
</para>
- <para>Note that the write cache won't be used for file handles with a
smb2 write lease.</para>
-
</description>
<related>oplocks</related>
diff --git a/docs-xml/smbdotconf/tuning/aioreadsize.xml
b/docs-xml/smbdotconf/tuning/aioreadsize.xml
index 71120a80388..5218f34a6d6 100644
--- a/docs-xml/smbdotconf/tuning/aioreadsize.xml
+++ b/docs-xml/smbdotconf/tuning/aioreadsize.xml
@@ -6,7 +6,7 @@
<para>If this integer parameter is set to a non-zero value,
Samba will read from files asynchronously when the request size is bigger
than this value. Note that it happens only for non-chained and non-chaining
- reads and when not using write cache.</para>
+ reads.</para>
<para>The only reasonable values for this parameter are 0 (no async I/O) and
1 (always do async I/O).</para>
<related>aio write size</related>
diff --git a/docs-xml/smbdotconf/tuning/aiowritesize.xml
b/docs-xml/smbdotconf/tuning/aiowritesize.xml
index cdc079d13dc..029e1d135c0 100644
--- a/docs-xml/smbdotconf/tuning/aiowritesize.xml
+++ b/docs-xml/smbdotconf/tuning/aiowritesize.xml
@@ -6,7 +6,7 @@
<para>If this integer parameter is set to a non-zero value,
Samba will write to files asynchronously when the request size is bigger
than this value. Note that it happens only for non-chained and non-chaining
- reads and when not using write cache.</para>
+ writes.</para>
<para>The only reasonable values for this parameter are 0 (no async I/O) and
1 (always do async I/O).</para>
<para>Compared to <smbconfoption name="aio read size"/> this parameter has
diff --git a/source3/client/client.c b/source3/client/client.c
index 8e29224918d..c4d309958cd 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -626,6 +626,7 @@ static NTSTATUS display_finfo(struct cli_state *cli_state,
struct file_info *fin
display_sec_desc(sd);
}
TALLOC_FREE(sd);
+ cli_close(targetcli, fnum);
}
TALLOC_FREE(afname);
}
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 4c6822f2c74..ff945302f54 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -353,7 +353,6 @@ static NTSTATUS schedule_smb2_sendfile_read(struct
smbd_smb2_request *smb2req,
* Signing is active OR
* This is a compound SMB2 operation OR
* fsp is a STREAM file OR
- * We're using a write cache OR
* It's not a regular file OR
* Requested offset is greater than file size OR
* there's not enough data in the file.
--
Samba Shared Repository
