]> granicus.if.org Git - ejabberd/commitdiff
Fix reading room jids from file for create and destroy_rooms_file commands
authorBadlop <badlop@process-one.net>
Fri, 4 Nov 2016 15:54:31 +0000 (16:54 +0100)
committerBadlop <badlop@process-one.net>
Fri, 4 Nov 2016 15:54:31 +0000 (16:54 +0100)
src/mod_muc_admin.erl

index e334dca2b89e70bf415341c7a2e5543c54f203d0..c9da1c66c9de41c46132e5e222b2f10e3424cab0 100644 (file)
@@ -514,7 +514,7 @@ destroy_room({N, H, SH}) ->
 %% The file encoding must be UTF-8
 
 destroy_rooms_file(Filename) ->
-    {ok, F} = file:open(Filename, [read, binary]),
+    {ok, F} = file:open(Filename, [read]),
     RJID = read_room(F),
     Rooms = read_rooms(F, RJID, []),
     file:close(F),
@@ -533,7 +533,7 @@ read_room(F) ->
        eof -> eof;
        String ->
            case io_lib:fread("~s", String) of
-               {ok, [RoomJID], _} -> split_roomjid(RoomJID);
+               {ok, [RoomJID], _} -> split_roomjid(list_to_binary(RoomJID));
                {error, What} ->
                    io:format("Parse error: what: ~p~non the line: ~p~n~n", [What, String])
            end
@@ -551,7 +551,7 @@ split_roomjid(RoomJID) ->
 %%----------------------------
 
 create_rooms_file(Filename) ->
-    {ok, F} = file:open(Filename, [read, binary]),
+    {ok, F} = file:open(Filename, [read]),
     RJID = read_room(F),
     Rooms = read_rooms(F, RJID, []),
     file:close(F),