osd/OSDCap: allow . for unquoted strings

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc
index ee77f0ea43d0ea0b44c05ec45bb56441b2133f3c..e315835f4babbe2f709a4234a8431d2ff5015ee9 100644 (file)
--- a/src/osd/OSDCap.cc
+++ b/src/osd/OSDCap.cc
@@ -178,7 +178,7 @@ struct OSDCapParser : qi::grammar<Iterator, OSDCap()>
     equoted_string %=
       lexeme['"' >> *(char_ - '"') >> '"'] |
       lexeme['\'' >> *(char_ - '\'') >> '\''];
-    unquoted_word %= +char_("a-zA-Z0-9_-");
+    unquoted_word %= +char_("a-zA-Z0-9_.-");
     str %= quoted_string | unquoted_word;
     estr %= equoted_string | unquoted_word;
 

diff --git a/src/test/osd/osdcap.cc b/src/test/osd/osdcap.cc
index 5f7c607deec47c208db06f846901087436241362..8fc3ddd812a1ba47df4fa2c9f211c88327a29323 100644 (file)
--- a/src/test/osd/osdcap.cc
+++ b/src/test/osd/osdcap.cc
@@ -41,6 +41,7 @@ const char *parse_good[] = {
   "allow rwx pool foo; allow r pool bar",
   "allow auid 123 rwx",
   "allow pool foo rwx, allow pool bar r",
+  "allow pool foo.froo.foo rwx, allow pool bar r",
   "allow pool foo rwx ; allow pool bar r",
   "allow pool foo rwx ;allow pool bar r",
   "allow pool foo rwx; allow pool bar r",