crush: allow - and _ in crushmap type/item names

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/crush/grammar.h b/src/crush/grammar.h
index 2e61750f497709bb92ab4fac23b9b7dd36d68c70..a68494d61da47932e69445fc14cafe93174b9c6e 100644 (file)
--- a/src/crush/grammar.h
+++ b/src/crush/grammar.h
@@ -87,7 +87,7 @@ struct crush_grammar : public grammar<crush_grammar>
                                            ] ];
       posint     =   leaf_node_d[ lexeme_d[ +digit_p ] ];
       negint     =   leaf_node_d[ lexeme_d[ ch_p('-') >> +digit_p ] ];
-      name = leaf_node_d[ lexeme_d[ +alnum_p ] ];
+      name = leaf_node_d[ lexeme_d[ +( alnum_p || ch_p('-') || ch_p('_')) ] ];
 
       // devices
       device = str_p("device") >> posint >> name;