diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-23 14:56:46 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-23 14:56:46 -0700 |
| commit | 7929228d564daee252e2cbfcd38ca9eb04b02c31 (patch) | |
| tree | 2955ddb32df47d2f367b8863bffe63562e9491e7 | |
| parent | 1f573c885cce776a7e8b2f3d4b91a304a8bc15c5 (diff) | |
| download | ceph-7929228d564daee252e2cbfcd38ca9eb04b02c31.tar.gz | |
osd/OSDCap: allow . for unquoted strings
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
| -rw-r--r-- | src/osd/OSDCap.cc | 2 | ||||
| -rw-r--r-- | src/test/osd/osdcap.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/OSDCap.cc b/src/osd/OSDCap.cc index ee77f0ea43d..e315835f4ba 100644 --- 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 5f7c607deec..8fc3ddd812a 100644 --- 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", |