diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/catalog/index_catalog.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/catalog/index_create.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/client.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/clientcursor.cpp | 3 | ||||
-rw-r--r-- | src/mongo/db/cloner.cpp | 16 | ||||
-rw-r--r-- | src/mongo/db/cloner.h | 1 | ||||
-rw-r--r-- | src/mongo/db/commands/clone.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/commands/clone_collection.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/commands/copydb.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/commands/copydb_getnonce.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/commands/get_last_error.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/commands/write_commands/batch_executor.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/db.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/dbcommands_generic.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/index_builder.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/range_deleter_db_env.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/write_concern.cpp | 9 | ||||
-rw-r--r-- | src/mongo/s/d_migrate.cpp | 2 |
18 files changed, 20 insertions, 30 deletions
diff --git a/src/mongo/db/catalog/index_catalog.cpp b/src/mongo/db/catalog/index_catalog.cpp index 48f640c0b89..35a0d2b6476 100644 --- a/src/mongo/db/catalog/index_catalog.cpp +++ b/src/mongo/db/catalog/index_catalog.cpp @@ -57,7 +57,6 @@ #include "mongo/db/ops/delete.h" #include "mongo/db/query/internal_plans.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/rs.h" // this is ugly #include "mongo/db/operation_context.h" #include "mongo/util/assert_util.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/catalog/index_create.cpp b/src/mongo/db/catalog/index_create.cpp index 07031334378..b965344fda7 100644 --- a/src/mongo/db/catalog/index_create.cpp +++ b/src/mongo/db/catalog/index_create.cpp @@ -44,7 +44,6 @@ #include "mongo/db/query/internal_plans.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/rs.h" #include "mongo/db/operation_context.h" #include "mongo/util/log.h" #include "mongo/util/processinfo.h" diff --git a/src/mongo/db/client.cpp b/src/mongo/db/client.cpp index 0423e4b5b23..9c927222d67 100644 --- a/src/mongo/db/client.cpp +++ b/src/mongo/db/client.cpp @@ -56,7 +56,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/repl/handshake_args.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/rs.h" #include "mongo/db/storage_options.h" #include "mongo/s/chunk_version.h" #include "mongo/s/d_state.h" diff --git a/src/mongo/db/clientcursor.cpp b/src/mongo/db/clientcursor.cpp index 17315bf566c..4c43cd50f9b 100644 --- a/src/mongo/db/clientcursor.cpp +++ b/src/mongo/db/clientcursor.cpp @@ -39,6 +39,7 @@ #include "mongo/db/auth/action_type.h" #include "mongo/db/auth/authorization_session.h" #include "mongo/db/auth/privilege.h" +#include "mongo/db/catalog/collection.h" #include "mongo/db/commands.h" #include "mongo/db/commands/server_status.h" #include "mongo/db/commands/server_status_metric.h" @@ -46,8 +47,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/operation_context_impl.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/rs.h" -#include "mongo/db/repl/write_concern.h" namespace mongo { diff --git a/src/mongo/db/cloner.cpp b/src/mongo/db/cloner.cpp index 8861ff4442e..1686cfe2c10 100644 --- a/src/mongo/db/cloner.cpp +++ b/src/mongo/db/cloner.cpp @@ -32,16 +32,16 @@ #include "mongo/platform/basic.h" -#include "mongo/base/init.h" +#include "mongo/db/cloner.h" + #include "mongo/base/status.h" #include "mongo/bson/util/builder.h" #include "mongo/client/dbclientinterface.h" -#include "mongo/db/auth/action_set.h" -#include "mongo/db/auth/resource_pattern.h" -#include "mongo/db/auth/authorization_session.h" +#include "mongo/db/auth/authorization_manager.h" +#include "mongo/db/auth/authorization_manager_global.h" +#include "mongo/db/auth/security_key.h" #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/index_create.h" -#include "mongo/db/cloner.h" #include "mongo/db/commands.h" #include "mongo/db/commands/copydb.h" #include "mongo/db/commands/rename_collection.h" @@ -52,7 +52,6 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/repl/isself.h" #include "mongo/db/repl/oplog.h" -#include "mongo/db/repl/oplogreader.h" #include "mongo/db/storage_options.h" #include "mongo/util/log.h" @@ -399,8 +398,11 @@ namespace mongo { auto_ptr<DBClientBase> con( cs.connect( errmsg )); if ( !con.get() ) return false; - if (!repl::replAuthenticate(con.get())) + if (getGlobalAuthorizationManager()->isAuthEnabled() && + !authenticateInternalUser(con.get())) { + return false; + } _conn = con; } diff --git a/src/mongo/db/cloner.h b/src/mongo/db/cloner.h index 0ee8752ee80..24f27befe47 100644 --- a/src/mongo/db/cloner.h +++ b/src/mongo/db/cloner.h @@ -39,6 +39,7 @@ namespace mongo { struct CloneOptions; class DBClientBase; class DBClientCursor; + class NamespaceString; class OperationContext; class Query; diff --git a/src/mongo/db/commands/clone.cpp b/src/mongo/db/commands/clone.cpp index 29a0dbd0dd5..a25deba9e32 100644 --- a/src/mongo/db/commands/clone.cpp +++ b/src/mongo/db/commands/clone.cpp @@ -47,7 +47,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" -#include "mongo/db/repl/oplogreader.h" #include "mongo/db/operation_context_impl.h" #include "mongo/db/storage_options.h" diff --git a/src/mongo/db/commands/clone_collection.cpp b/src/mongo/db/commands/clone_collection.cpp index 5dc75a5dba4..cab0a57c9eb 100644 --- a/src/mongo/db/commands/clone_collection.cpp +++ b/src/mongo/db/commands/clone_collection.cpp @@ -48,7 +48,6 @@ #include "mongo/db/namespace_string.h" #include "mongo/db/repl/isself.h" #include "mongo/db/repl/oplog.h" -#include "mongo/db/repl/oplogreader.h" #include "mongo/db/operation_context_impl.h" #include "mongo/db/storage_options.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/commands/copydb.cpp b/src/mongo/db/commands/copydb.cpp index e6282324848..208d792c59e 100644 --- a/src/mongo/db/commands/copydb.cpp +++ b/src/mongo/db/commands/copydb.cpp @@ -48,7 +48,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" -#include "mongo/db/repl/oplogreader.h" #include "mongo/db/operation_context_impl.h" #include "mongo/db/storage_options.h" diff --git a/src/mongo/db/commands/copydb_getnonce.cpp b/src/mongo/db/commands/copydb_getnonce.cpp index cc8bec23ad2..db9f038967f 100644 --- a/src/mongo/db/commands/copydb_getnonce.cpp +++ b/src/mongo/db/commands/copydb_getnonce.cpp @@ -47,7 +47,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/namespace_string.h" #include "mongo/db/repl/oplog.h" -#include "mongo/db/repl/oplogreader.h" #include "mongo/db/operation_context_impl.h" #include "mongo/db/storage_options.h" diff --git a/src/mongo/db/commands/get_last_error.cpp b/src/mongo/db/commands/get_last_error.cpp index cd85a3a2a6f..a3c08763ad7 100644 --- a/src/mongo/db/commands/get_last_error.cpp +++ b/src/mongo/db/commands/get_last_error.cpp @@ -38,7 +38,6 @@ #include "mongo/db/field_parser.h" #include "mongo/db/lasterror.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/rs.h" #include "mongo/db/write_concern.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp index ce4609ac4af..8b21578ce89 100644 --- a/src/mongo/db/commands/write_commands/batch_executor.cpp +++ b/src/mongo/db/commands/write_commands/batch_executor.cpp @@ -51,7 +51,6 @@ #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/repl_coordinator_global.h" #include "mongo/db/repl/repl_settings.h" -#include "mongo/db/repl/rs.h" #include "mongo/db/server_parameters.h" #include "mongo/db/stats/counters.h" #include "mongo/db/operation_context_impl.h" diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp index 2152f8c6e01..85a1e828e3f 100644 --- a/src/mongo/db/db.cpp +++ b/src/mongo/db/db.cpp @@ -75,7 +75,6 @@ #include "mongo/db/repl/repl_coordinator_global.h" #include "mongo/db/repl/repl_coordinator_hybrid.h" #include "mongo/db/repl/repl_settings.h" -#include "mongo/db/repl/rs.h" #include "mongo/db/restapi.h" #include "mongo/db/server_parameters.h" #include "mongo/db/startup_warnings_mongod.h" @@ -93,6 +92,7 @@ #include "mongo/util/exception_filter_win32.h" #include "mongo/util/exit.h" #include "mongo/util/log.h" +#include "mongo/util/mmap.h" #include "mongo/util/net/message_server.h" #include "mongo/util/net/ssl_manager.h" #include "mongo/util/ntservice.h" diff --git a/src/mongo/db/dbcommands_generic.cpp b/src/mongo/db/dbcommands_generic.cpp index 5ff4089086b..40a3005e0eb 100644 --- a/src/mongo/db/dbcommands_generic.cpp +++ b/src/mongo/db/dbcommands_generic.cpp @@ -48,8 +48,6 @@ #include "mongo/db/json.h" #include "mongo/db/lasterror.h" #include "mongo/db/log_process_details.h" -#include "mongo/db/repl/multicmd.h" -#include "mongo/db/repl/write_concern.h" #include "mongo/db/server_options.h" #include "mongo/db/stats/counters.h" #include "mongo/scripting/engine.h" diff --git a/src/mongo/db/index_builder.cpp b/src/mongo/db/index_builder.cpp index 9da3a776003..6d477063ee5 100644 --- a/src/mongo/db/index_builder.cpp +++ b/src/mongo/db/index_builder.cpp @@ -32,13 +32,13 @@ #include "mongo/db/index_builder.h" +#include "mongo/db/auth/authorization_session.h" #include "mongo/db/client.h" #include "mongo/db/curop.h" #include "mongo/db/catalog/database.h" #include "mongo/db/catalog/database_holder.h" #include "mongo/db/catalog/index_create.h" #include "mongo/db/concurrency/d_concurrency.h" -#include "mongo/db/repl/rs.h" #include "mongo/db/operation_context_impl.h" #include "mongo/util/log.h" #include "mongo/util/mongoutils/str.h" @@ -66,7 +66,7 @@ namespace mongo { Client::initThread(name().c_str()); Lock::ParallelBatchWriterMode::iAmABatchParticipant(txn.lockState()); - repl::replLocalAuth(); + cc().getAuthorizationSession()->grantInternalAuthorization(); txn.getCurOp()->reset(HostAndPort(), dbInsert); NamespaceString ns(_index["ns"].String()); diff --git a/src/mongo/db/range_deleter_db_env.cpp b/src/mongo/db/range_deleter_db_env.cpp index 8b75c7881fb..0c7f5676c36 100644 --- a/src/mongo/db/range_deleter_db_env.cpp +++ b/src/mongo/db/range_deleter_db_env.cpp @@ -34,11 +34,11 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/authorization_session.h" +#include "mongo/db/catalog/collection.h" #include "mongo/db/client.h" #include "mongo/db/clientcursor.h" #include "mongo/db/dbhelpers.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/rs.h" #include "mongo/db/write_concern_options.h" #include "mongo/s/d_state.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/write_concern.cpp b/src/mongo/db/write_concern.cpp index 90fe69b947b..2afba664721 100644 --- a/src/mongo/db/write_concern.cpp +++ b/src/mongo/db/write_concern.cpp @@ -26,19 +26,20 @@ * it in the license file. */ +#include "mongo/platform/basic.h" + +#include "mongo/db/write_concern.h" + #include "mongo/base/counter.h" #include "mongo/db/commands/server_status_metric.h" #include "mongo/db/global_environment_experiment.h" #include "mongo/db/operation_context.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/repl_settings.h" -#include "mongo/db/repl/write_concern.h" #include "mongo/db/server_options.h" #include "mongo/db/stats/timer_stats.h" #include "mongo/db/storage/mmap_v1/dur.h" #include "mongo/db/storage/storage_engine.h" -#include "mongo/db/write_concern.h" -#include "mongo/util/mmap.h" +#include "mongo/db/write_concern_options.h" namespace mongo { diff --git a/src/mongo/s/d_migrate.cpp b/src/mongo/s/d_migrate.cpp index df795ba771e..322c373628f 100644 --- a/src/mongo/s/d_migrate.cpp +++ b/src/mongo/s/d_migrate.cpp @@ -66,9 +66,7 @@ #include "mongo/db/range_deleter_service.h" #include "mongo/db/repl/oplog.h" #include "mongo/db/repl/repl_coordinator_global.h" -#include "mongo/db/repl/repl_settings.h" #include "mongo/db/repl/rs.h" -#include "mongo/db/repl/rs_config.h" #include "mongo/db/operation_context_impl.h" #include "mongo/db/write_concern.h" #include "mongo/logger/ramlog.h" |