diff options
| author | Volker Lendecke <vl@samba.org> | 2016-02-11 13:11:46 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2016-02-15 14:36:43 +0100 |
| commit | 6c1a5f0c230dbb98b60230d169512def09966678 (patch) | |
| tree | 68c8508061344c2ddd32590cb01e8fc9b0a2e1e6 | |
| parent | 11b89bdc2570b670149f7f3bd8d98224b181b75c (diff) | |
| download | samba-6c1a5f0c230dbb98b60230d169512def09966678.tar.gz | |
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
Autobuild-User(v4-3-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-3-test): Mon Feb 15 14:36:43 CET 2016 on sn-devel-104
| -rw-r--r-- | lib/util/util_strlist.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/util/util_strlist.c b/lib/util/util_strlist.c index 987fdfbdd33..2c1c2d5f4ff 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; |