Merge PR ceph#16891 into master

* refs/remotes/upstream/pull/16891/head: mds/MDSDaemon: add 'is_valid=false' when failed to parse caps Reviewed-by: Jos Collin <[email protected]> Reviewed-by: Patrick Donnelly <[email protected]>
amincheloh · Aug 16, 2017 · 588e5d0 · 588e5d0
2 parents f7f8318 + 353a897
commit 588e5d0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc
@@ -1357,12 +1357,14 @@ bool MDSDaemon::ms_verify_authorizer(Connection *con, int peer_type,
 		<< " parsing '" << auth_cap_str << "'" << dendl;
 	clog->warn() << name << " mds cap '" << auth_cap_str
 		     << "' does not parse: " << errstr.str();
+        is_valid = false;
       }
     } catch (buffer::error& e) {
       // Assume legacy auth, defaults to:
       //  * permit all filesystem ops
       //  * permit no `tell` ops
       dout(1) << __func__ << ": cannot decode auth caps bl of length " << caps_info.caps.length() << dendl;
+      is_valid = false;
     }
   }