sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

param: Fix str_list_v3 to accept ; again

Browse Source 
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
This commit is contained in:
Volker Lendecke 2016-02-11 13:11:46 +01:00
parent 5172bf0c5b
commit d66f2c86f7
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/util/util_strlist_v3.c
View File

@ -67,7 +67,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;