From 513ae178e8b1ee2f5cf1f14cc02e6ca13411aa3a Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 23 Oct 2009 12:28:59 -0700 Subject: [PATCH] auth: osd parser to accept 'pool' --- src/osd/OSD.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e0f4a0df4b468..c8ec9c7ef9bd8 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4346,7 +4346,7 @@ bool OSD::OSDCaps::parse(bufferlist::iterator& iter) try { ::decode(s, iter); - *_dout << "decoded caps: " << s << std::endl; + generic_dout(0) << "decoded caps: " << s << std::endl; size_t pos = 0; string token; @@ -4391,7 +4391,8 @@ do { \ } else if (token.compare("deny") == 0) { ASSERT_STATE((!op_allow) && (!op_deny)); op_deny = true; - } else if (token.compare("pools") == 0) { + } else if ((token.compare("pools") == 0) || + (token.compare("pool") == 0)) { ASSERT_STATE(op_allow || op_deny); cmd_pool = true; any_cmd = true; @@ -4436,13 +4437,12 @@ do { \ return false; } - *_dout << "default=" << default_action << std::endl; + generic_dout(0) << "default=" << default_action << std::endl; map::iterator it; for (it = pools_map.begin(); it != pools_map.end(); ++it) { - *_dout << it->first << " -> (" << it->second.allow << "." << it->second.deny << ")" << std::endl; + generic_dout(0) << it->first << " -> (" << it->second.allow << "." << it->second.deny << ")" << std::endl; } - return true; } -- 2.39.5