From c7683d5aae3d154250df531a5d34e4a464b5ced2 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 23 Nov 2012 08:15:51 +0100 Subject: [PATCH] "valid users" options and friends only use ',' as field delimiter Netatalk 3 uses ',' and ' ' as field delimiter in the "valid users", "invalid users", "rolist" and "rwlist" option for consistency with other options that also allow the use of ' ' as field delimiter. But as user and groupnames may contain spaces, we need to revert to the Netatalk 2 behaviour where only ',' was used as delimiter. Fixes bug #472. --- libatalk/util/netatalk_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c index fd7ebfd1..067ed454 100644 --- a/libatalk/util/netatalk_conf.c +++ b/libatalk/util/netatalk_conf.c @@ -402,7 +402,7 @@ static char *volxlate(const AFPObj *obj, * check access list * * this function wants something of the following form: - * "@group,name,name2,@group2,name3" or "@group name name2 @group2 name3" + * "@group,name,name2,@group2,name3". * A NULL argument allows everybody to have access. * We return three things: * -1: no list @@ -418,7 +418,7 @@ static int accessvol(const AFPObj *obj, const char *args, const char *name) return -1; strlcpy(buf, args, sizeof(buf)); - if ((p = strtok(buf, ", ")) == NULL) /* nothing, return okay */ + if ((p = strtok(buf, ",")) == NULL) /* nothing, return okay */ return -1; while (p) { -- 2.39.2