Give external users a 'credentials' field

2 files changed, 4 insertions, 1 deletions

diff --git a/jstests/auth/adduser_helper.js b/jstests/auth/adduser_helper.js
index d28da430cf2..209eebb5172 100644
--- a/jstests/auth/adduser_helper.js
+++ b/jstests/auth/adduser_helper.js
@@ -61,4 +61,4 @@ assert.eq(2, admin.system.users.count());
 userObj = admin.system.users.findOne({user:'spencer', db:'$external'});
 assert.eq('spencer', userObj['user']);
 assert.eq('$external', userObj['db']);
-assert(!userObj['credentials']);
+assert.eq(true, userObj['credentials']['external']);
diff --git a/src/mongo/db/commands/user_management_commands.cpp b/src/mongo/db/commands/user_management_commands.cpp
index 7163e9ea2f0..b551991faac 100644
--- a/src/mongo/db/commands/user_management_commands.cpp
+++ b/src/mongo/db/commands/user_management_commands.cpp
@@ -336,6 +336,9 @@ namespace mongo {
                                   args.userName.getDB());
             if (args.hasHashedPassword) {
                 userObjBuilder.append("credentials", BSON("MONGODB-CR" << args.hashedPassword));
+            } else {
+                // Must be an external user
+                userObjBuilder.append("credentials", BSON("external" << true));
             }
             if (args.hasCustomData) {
                 userObjBuilder.append("customData", args.customData);