summaryrefslogtreecommitdiff
path: root/src/mongo/db/auth/privilege_parser.h
diff options
context:
space:
mode:
authorSpencer T Brody <spencer@mongodb.com>2015-12-07 16:56:11 -0500
committerSpencer T Brody <spencer@mongodb.com>2015-12-09 11:18:31 -0500
commit13270a048515916324c5f44958c225550d5c4dc9 (patch)
tree18ff49d60cc1ea159329bb122d28bd8762ac5382 /src/mongo/db/auth/privilege_parser.h
parent1c936e91a124e44d1925a15bf0e207dc4f7942a1 (diff)
downloadmongo-13270a048515916324c5f44958c225550d5c4dc9.tar.gz
SERVER-21535 Make mongos ignore unrecognized actions during privilege parsing while authenticating users
Diffstat (limited to 'src/mongo/db/auth/privilege_parser.h')
-rw-r--r--src/mongo/db/auth/privilege_parser.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mongo/db/auth/privilege_parser.h b/src/mongo/db/auth/privilege_parser.h
index a48297c862f..6275dcc2a3d 100644
--- a/src/mongo/db/auth/privilege_parser.h
+++ b/src/mongo/db/auth/privilege_parser.h
@@ -143,10 +143,12 @@ public:
/**
* Takes a parsedPrivilege and turns it into a true Privilege object.
+ * If the parsedPrivilege contains any unrecognized privileges it will add those to
+ * unrecognizedActions.
*/
- static bool parsedPrivilegeToPrivilege(const ParsedPrivilege& parsedPrivilege,
- Privilege* result,
- std::string* errmsg);
+ static Status parsedPrivilegeToPrivilege(const ParsedPrivilege& parsedPrivilege,
+ Privilege* result,
+ std::vector<std::string>* unrecognizedActions);
/**
* Takes a Privilege object and turns it into a ParsedPrivilege.
*/