1 files changed, 9 insertions, 29 deletions

diff --git a/src/rabbit.erl b/src/rabbit.erl
index 86f5d7745a..69f72bfd55 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -103,7 +103,7 @@ manage_applications(Iterate, Do, Undo, SkipError, ErrorTag, Apps) ->
                     end
             end, [], Apps),
     ok.
-    
+
 start_applications(Apps) ->
     manage_applications(fun lists:foldl/3,
                         fun application:start/1,
@@ -133,9 +133,9 @@ start(normal, []) ->
               io:format("starting ~-20s ...", [Msg]),
               Thunk(),
               io:format("done~n");
-	  ({Msg, M, F, A}) ->
+          ({Msg, M, F, A}) ->
               io:format("starting ~-20s ...", [Msg]),
-	      apply(M, F, A),
+              apply(M, F, A),
               io:format("done~n")
       end,
       [{"database",
@@ -155,14 +155,12 @@ start(normal, []) ->
        {"recovery",
         fun () ->
                 ok = maybe_insert_default_data(),
-                
                 ok = rabbit_exchange:recover(),
-                ok = rabbit_amqqueue:recover(),
-                ok = rabbit_realm:recover()
+                ok = rabbit_amqqueue:recover()
         end},
        {"persister",
-        fun () -> 
-                ok = start_child(rabbit_persister) 
+        fun () ->
+                ok = start_child(rabbit_persister)
         end},
        {"builtin applications",
         fun () ->
@@ -220,26 +218,8 @@ insert_default_data() ->
     {ok, DefaultPass} = application:get_env(default_pass),
     {ok, DefaultVHost} = application:get_env(default_vhost),
     ok = rabbit_access_control:add_vhost(DefaultVHost),
-    ok = insert_default_user(DefaultUser, DefaultPass,
-                             [{DefaultVHost, [<<"/data">>, <<"/admin">>]}]),
-    ok.
-
-insert_default_user(Username, Password, VHostSpecs) ->
-    ok = rabbit_access_control:add_user(Username, Password),
-    lists:foreach(
-      fun ({VHostPath, Realms}) ->
-              ok = rabbit_access_control:map_user_vhost(
-                     Username, VHostPath),
-              lists:foreach(
-                fun (Realm) ->
-                        RealmFullName = 
-                            rabbit_misc:r(VHostPath, realm, Realm),
-                        ok = rabbit_access_control:map_user_realm(
-                               Username,
-                               rabbit_access_control:full_ticket(
-                                 RealmFullName))
-                end, Realms)
-      end, VHostSpecs),
+    ok = rabbit_access_control:add_user(DefaultUser, DefaultPass),
+    ok = rabbit_access_control:map_user_vhost(DefaultUser, DefaultVHost),
     ok.
 
 start_builtin_amq_applications() ->
@@ -278,7 +258,7 @@ error_log_location() ->
     end.
 
 sasl_log_location() ->
-    case application:get_env(sasl, sasl_error_logger) of 
+    case application:get_env(sasl, sasl_error_logger) of
         {ok, {file, File}} -> File;
         {ok, false}        -> undefined;
         {ok, tty}          -> tty;