Merge branch 'master' of github.com:mongodb/mongo

1 files changed, 6 insertions, 0 deletions

diff --git a/shell/dbshell.cpp b/shell/dbshell.cpp
index a1768e433fa..4006f48e2ed 100644
--- a/shell/dbshell.cpp
+++ b/shell/dbshell.cpp
@@ -724,6 +724,12 @@ int _main(int argc, char* argv[]) {
         logLevel = 1;
     }
 
+    if ( url == "*" ) {
+        cout << "ERROR: " << "\"*\" is an invalid db address" << endl << endl;
+        show_help_text(argv[0], shell_options);
+        return mongo::EXIT_BADOPTIONS;
+    }
+
     if ( ! mongo::cmdLine.quiet )
         cout << "MongoDB shell version: " << mongo::versionString << endl;