Attachment 11838 Details for Bug 11732 – Patch for 4.x

[patch] Patch for 4.x

11732.patch (text/plain), 1.53 KB, created by Volker Lendecke on 2016-02-15 10:05:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Volker Lendecke

Created: 2016-02-15 10:05:11 UTC

Size: 1.53 KB

patch

obsolete

>From 86ce581e3d8cbfbbc96efdd1fcdde86d5446d59b Mon Sep 17 00:00:00 2001
>From: Volker Lendecke <vl@samba.org>
>Date: Thu, 11 Feb 2016 13:11:46 +0100
>Subject: [PATCH] param: Fix str_list_v3 to accept ; again
>
>Signed-off-by: Volker Lendecke <vl@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Thu Feb 11 19:19:55 CET 2016 on sn-devel-144
>https://bugzilla.samba.org/show_bug.cgi?id=11732
>---
> lib/util/util_strlist.c |   18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
>diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c
>index 987fdfb..2c1c2d5 100644
>--- a/lib/util/util_strlist.c
>+++ b/lib/util/util_strlist.c
>@@ -552,7 +552,23 @@ char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
> 		TALLOC_FREE(list);
> 		return NULL;
> 	}
>-	if (!sep) sep = LIST_SEP;
>+
>+	/*
>+	 * DON'T REPLACE THIS BY "LIST_SEP". The common version of
>+	 * LIST_SEP does not contain the ;, which used to be accepted
>+	 * by Samba 4.0 before param merges. It would be the far
>+	 * better solution to split the _v3 version again to source3/
>+	 * where it belongs, see the _v3 in its name.
>+	 *
>+	 * Unfortunately it is referenced in /lib/param/loadparm.c,
>+	 * which depends on the version that the AD-DC mandates,
>+	 * namely without the ; as part of the list separator. I am
>+	 * missing the waf fu to properly work around the wrong
>+	 * include paths here for this defect.
>+	 */
>+	if (sep == NULL) {
>+		sep = " \t,;\n\r";
>+	}
> 
> 	num = 0;
> 	str = s;
>-- 
>1.7.9.5
>

Flags:

obnox: review+
slow: review+

Actions: View

Attachments on bug 11732: 11838