summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorKristina <kristina@10gen.com>2011-03-18 15:56:16 -0400
committerKristina <kristina@10gen.com>2011-03-18 15:57:06 -0400
commit8c8c3368df0df6e354a32bf5ec70e1fd65b9e110 (patch)
tree48912fe3c6988445d193bd9ac63c6e1960206a51 /db
parent25f158176761386f68624052de1952f5c8ab5599 (diff)
downloadmongo-8c8c3368df0df6e354a32bf5ec70e1fd65b9e110.tar.gz
check for js engine before running group SERVER-2786
Diffstat (limited to 'db')
-rw-r--r--db/commands/group.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/db/commands/group.cpp b/db/commands/group.cpp
index 0cc6ab314b1..422c35588b7 100644
--- a/db/commands/group.cpp
+++ b/db/commands/group.cpp
@@ -139,6 +139,11 @@ namespace mongo {
bool run(const string& dbname, BSONObj& jsobj, string& errmsg, BSONObjBuilder& result, bool fromRepl ) {
+ if ( !globalScriptEngine ) {
+ errmsg = "server-side JavaScript execution is disabled";
+ return false;
+ }
+
/* db.$cmd.findOne( { group : <p> } ) */
const BSONObj& p = jsobj.firstElement().embeddedObjectUserCheck();