Merge ~ahasenack/ubuntu/+source/samba:trusty-samba-include-1583324 into ubuntu/+source/samba:ubuntu/trusty-devel

[Andreas Hasenack]

Fix for https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1583324. Bug has the SRU template and testing instructions.

PPA with test packages: https://launchpad.net/~ahasenack/+archive/ubuntu/samba-include-1583324 (ppa:ahasenack/samba-include-1583324).

TL;DR "samba-tool testparm" chokes when smb.conf has an include file directive that uses %variable substitutions: it tries to load the filename without expanding the variable. The patch makes it ignore such cases.

[Andreas Hasenack (ahasenack)]

If approving this, then also please push the upload tag and sponsor it, as I can't upload samba myself. Thanks.

[Christian Ehrhardt  (paelzer)]

Formalisms (changelog, version, headers, ...) all LGTM.
Code change itself reads ok from a samba code POV.
Changes are upstream and in newer Ubuntu releases already for a while.

next is testing ...

[Christian Ehrhardt  (paelzer)]

First of all upgrade and the fix as described worked and you have my +1 on what you fixed.

An extra commend/discussion in the Xenial MP of this.

[Christian Ehrhardt  (paelzer)]

review: Needs Information

[Christian Ehrhardt  (paelzer)]

+1 after discussion in the related Xenial MP

review: Approve

[Christian Ehrhardt  (paelzer)]

upload/2%4.3.11+dfsg-0ubuntu0.14.04.15 pushed

$ dput ubuntu ../samba_4.3.11+dfsg-0ubuntu0.14.04.15_source.changes
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading samba_4.3.11+dfsg-0ubuntu0.14.04.15.dsc: done.
  Uploading samba_4.3.11+dfsg-0ubuntu0.14.04.15.debian.tar.xz: done.
  Uploading samba_4.3.11+dfsg-0ubuntu0.14.04.15_source.buildinfo: done.
  Uploading samba_4.3.11+dfsg-0ubuntu0.14.04.15_source.changes: done.
Successfully uploaded packages.

[Christian Ehrhardt  (paelzer)]

Please set to merged when accepted by the SRU Team

diff --git a/debian/changelog b/debian/changelog
index 43819f4..af969c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+samba (2:4.3.11+dfsg-0ubuntu0.14.04.17) trusty; urgency=medium
+
+  * d/p/bug_1583324_include_with_macro.patch: don't fail parsing the
+    config file if it has macros in include directives (LP: #1583324)
+
+ -- Andreas Hasenack <[e-mail]>  Thu, 02 Aug 2018 18:27:50 -0300
+
 samba (2:4.3.11+dfsg-0ubuntu0.14.04.16) trusty-security; urgency=medium
 
   * SECURITY UPDATE: Insufficient input validation on client directory
diff --git a/debian/patches/bug_1583324_include_with_macro.patch b/debian/patches/bug_1583324_include_with_macro.patch
new file mode 100644
index 0000000..600070e
--- /dev/null
+++ b/debian/patches/bug_1583324_include_with_macro.patch
@@ -0,0 +1,65 @@
+From 3c6ea3293c6aac67bc442f47185fd494714e4806 Mon Sep 17 00:00:00 2001
+From: Quentin Gibeaux <[e-mail]>
+Date: Thu, 29 Oct 2015 13:48:27 +0100
+Subject: [PATCH] lib/param: handle (ignore) substitution variable in smb.conf
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=10722
+
+The function handle_include returns false when trying to include
+files that have a substitution variable in filename (like %U),
+this patch makes handle_include to ignore this case, to make
+samba-tool work when there is such include in samba's configuration.
+
+Error was :
+	root@ubuntu:/usr/local/samba# grep 'include.*%U' etc/smb.conf
+	include = %U.conf
+	root@ubuntu:/usr/local/samba# ./bin/samba-tool user list
+	Can't find include file %U.conf
+	ERROR(runtime): uncaught exception - Unable to load default file
+
+Signed-off-by: Quentin Gibeaux <[e-mail]>
+Reviewed-by: Michael Adam <[e-mail]>
+Reviewed-by: Jeremy Allison <[e-mail]>
+
+Autobuild-User(master): Jeremy Allison <[e-mail]>
+Autobuild-Date(master): Wed Dec  9 02:05:30 CET 2015 on sn-devel-104
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/1583324
+Last-Update: 2018-10-02
+---
+ lib/param/loadparm.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/lib/param/loadparm.c
++++ b/lib/param/loadparm.c
+@@ -1109,6 +1109,8 @@
+ 			   const char *pszParmValue, char **ptr)
+ {
+ 	char *fname;
++	const char *substitution_variable_substring;
++	char next_char;
+ 
+ 	if (lp_ctx->s3_fns) {
+ 		return lp_ctx->s3_fns->lp_include(lp_ctx, service, pszParmValue, ptr);
+@@ -1123,6 +1125,22 @@
+ 	if (file_exist(fname))
+ 		return pm_process(fname, do_section, lpcfg_do_parameter, lp_ctx);
+ 
++       /*
++        * If the file doesn't exist, we check that it isn't due to variable
++        * substitution
++        */
++	substitution_variable_substring = strchr(fname, '%');
++
++	if (substitution_variable_substring != NULL) {
++		next_char = substitution_variable_substring[1];
++		if ((next_char >= 'a' && next_char <= 'z')
++		    || (next_char >= 'A' && next_char <= 'Z')) {
++			DEBUG(2, ("Tried to load %s but variable substitution in "
++				 "filename, ignoring file.\n", fname));
++			return true;
++		}
++	}
++
+ 	DEBUG(2, ("Can't find include file %s\n", fname));
+ 
+ 	return false;
diff --git a/debian/patches/series b/debian/patches/series
index f2ce2cb..9b1f74a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -103,3 +103,4 @@ CVE-2018-10919-7.patch
 CVE-2018-10919-8.patch
 CVE-2018-10919-9.patch
 CVE-2018-10919-10.patch
+bug_1583324_include_with_macro.patch