Revert c7683d5aae3d154250df531a5d34e4a464b5ced2

'valid users' option, cf #472.

diff --git a/NEWS b/NEWS
index 94f6649a0e6177efa10a9236a5fed15c0a7d1a13..cb28553ff631848f09443884d7d5504379c75e0d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,8 +10,6 @@ Changes in 3.0.2
        Fixes bug #474.
 * FIX: Fix _device-info service type registered with dns-sd API
 * FIX: Fix pathname bug for FCE modified event.
-* FIX: "valid users" options and friends only use ',' as field delimiter.
-       Fixes bug #472.
 * FIX: Remove length limitation of options like "valid users".
        Fixes bug #473.
 * FIX: Dont copy our metadata EA in copyfile().

diff --git a/libatalk/util/netatalk_conf.c b/libatalk/util/netatalk_conf.c
index 12b766650066243e2019accc40d4114e781d5549..338394e176b0358cc9165dac68e00642b2278c68 100644 (file)
--- 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".
+ * "@group,name,name2,@group2,name3" or "@group name name2 @group2 name3"
  * A NULL argument allows everybody to have access.
  * We return three things:
  *     -1: no list
@@ -420,7 +420,7 @@ static int accessvol(const AFPObj *obj, const char *args, const char *name)
 
     EC_NULL_LOG( names = strdup(args) );
 
-    if ((p = strtok(names, ",")) == NULL) /* nothing, return okay */
+    if ((p = strtok(names, ", ")) == NULL) /* nothing, return okay */
         EC_EXIT_STATUS(-1);
 
     while (p) {