1 files changed, 16 insertions, 6 deletions
diff --git a/src/mongo/db/fts/fts_command.cpp b/src/mongo/db/fts/fts_command.cpp
index 45be13d198f..644024c8e17 100644
--- a/src/mongo/db/fts/fts_command.cpp
+++ b/src/mongo/db/fts/fts_command.cpp
@@ -14,14 +14,24 @@
 *
 *    You should have received a copy of the GNU Affero General Public License
 *    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+*    As a special exception, the copyright holders give permission to link the
+*    code of portions of this program with the OpenSSL library under certain
+*    conditions as described in each individual source file and distribute
+*    linked combinations including the program with the OpenSSL library. You
+*    must comply with the GNU Affero General Public License in all respects for
+*    all of the code used other than as permitted herein. If you modify file(s)
+*    with this exception, you may extend this exception to your version of the
+*    file(s), but you are not obligated to do so. If you do not wish to do so,
+*    delete this exception statement from your version. If you delete this
+*    exception statement from all source files in the program, then also delete
+*    it in the license file.
 */
 
 #include <string>
 #include <vector>
 
 #include "mongo/db/fts/fts_command.h"
-#include "mongo/db/fts/fts_enabled.h"
-#include "mongo/db/fts/fts_search.h"
 #include "mongo/db/fts/fts_util.h"
 #include "mongo/util/mongoutils/str.h"
 #include "mongo/util/timer.h"
@@ -43,7 +53,7 @@ namespace mongo {
                                                std::vector<Privilege>* out) {
             ActionSet actions;
             actions.addAction(ActionType::find);
-            out->push_back(Privilege(parseNs(dbname, cmdObj), actions));
+            out->push_back(Privilege(parseResourcePattern(dbname, cmdObj), actions));
         }
 
 
@@ -54,9 +64,9 @@ namespace mongo {
                              BSONObjBuilder& result,
                              bool fromRepl) {
 
-            if ( !isTextSearchEnabled() ) {
-                errmsg = "text search not enabled";
-                return false;
+            ONCE {
+                log() << "The text command will be removed in a future release.  Use the $text "
+                         "query operator instead." << startupWarningsLog;
             }
 
             string ns = dbname + "." + cmdObj.firstElement().String();