Bug#847500: jessie-pu: package samba/2:4.2.14+dfsg-0+deb8u2
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Hello stable release managers,
Here is another samba fix on top of #836795.
It fixes smbclient compatibility with Windows 10 (#820794).
Regards
Mathieu Parent
diff --git a/debian/changelog b/debian/changelog
index 2259e6c..ab5ad1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+samba (2:4.2.14+dfsg-0+deb8u2) jessie; urgency=medium
+
+ * Fix smbclient compatibility with Windows 10 (Closes: #820794)
+
+ -- Mathieu Parent <sathieu@debian.org> Thu, 08 Dec 2016 21:12:25 +0100
+
samba (2:4.2.14+dfsg-0+deb8u1) jessie; urgency=high
* New upstream release.
diff --git a/debian/patches/s3-libsmb-Fix-error-where-short-name-length-was-read.patch b/debian/patches/s3-libsmb-Fix-error-where-short-name-length-was-read.patch
new file mode 100644
index 0000000..766166a
--- /dev/null
+++ b/debian/patches/s3-libsmb-Fix-error-where-short-name-length-was-read.patch
@@ -0,0 +1,41 @@
+From ad1e26995710c6e759aa18a68959c769d186c62a Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra@samba.org>
+Date: Tue, 5 Apr 2016 13:07:06 -0700
+Subject: [PATCH] s3: libsmb: Fix error where short name length was read as 2
+ bytes, should be 1.
+
+Reported by Thomas Dvorachek <tdvorachek@yahoo.com> from a Windows 10 server.
+Confirmed in MS-CIFS 2.2.8.1.7.
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=11822
+
+Signed-off-by: Jeremy Allison <jra@samba.org>
+Reviewed-by: Ralph Boehme <slow@samba.org>
+
+Autobuild-User(master): Jeremy Allison <jra@samba.org>
+Autobuild-Date(master): Wed Apr 6 03:46:55 CEST 2016 on sn-devel-144
+
+(cherry picked from commit f63b9a73b03971f41947c694e6952cd1e49b67c3)
+
+Bug-Debian: https://bugs.debian.org/820794
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1576449
+---
+ source3/libsmb/clilist.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
+index 2e50239..58bddd8 100644
+--- a/source3/libsmb/clilist.c
++++ b/source3/libsmb/clilist.c
+@@ -186,7 +186,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
+ namelen = IVAL(p,0);
+ p += 4;
+ p += 4; /* EA size */
+- slen = SVAL(p, 0);
++ slen = CVAL(p, 0);
+ if (slen > 24) {
+ /* Bad short name length. */
+ return pdata_end - base;
+--
+2.10.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 4399ad9..5315481 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ fix_pam_smbpass.patch
disable-socketwrapper.diff
unprivate-samba-debug.patch
ctdb-Fix-detection-of-gnukfreebsd.patch
+s3-libsmb-Fix-error-where-short-name-length-was-read.patch
diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c
index 2e50239..58bddd8 100644
--- a/source3/libsmb/clilist.c
+++ b/source3/libsmb/clilist.c
@@ -186,7 +186,7 @@ static size_t interpret_long_filename(TALLOC_CTX *ctx,
namelen = IVAL(p,0);
p += 4;
p += 4; /* EA size */
- slen = SVAL(p, 0);
+ slen = CVAL(p, 0);
if (slen > 24) {
/* Bad short name length. */
return pdata_end - base;
Reply to: