From 56683328eca68315516a9268d217345f2a19268c Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 23 Mar 2022 15:49:58 +0100
Subject: [PATCH 1/4] docs: delete '4.3' from 4.4 config file comment

---
 etc/emqx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/emqx.conf b/etc/emqx.conf
index 8b8c0aca4..3b4cca025 100644
--- a/etc/emqx.conf
+++ b/etc/emqx.conf
@@ -1,4 +1,4 @@
-## EMQX Configuration 4.3
+## EMQX Configuration
 
 ## NOTE: Do not change format of CONFIG_SECTION_{BGN,END} comments!
 

From b99627b86670b1bcbd6f42221960412825e803d4 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 23 Mar 2022 15:50:36 +0100
Subject: [PATCH 2/4] chore(emqx_auth_mongo_sup): port changes from ee back to
 ce

---
 apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl b/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl
index 55263494a..982b20727 100644
--- a/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl
+++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo_sup.erl
@@ -34,7 +34,8 @@ init([]) ->
     {ok, {{one_for_all, 10, 100}, [PoolSpec]}}.
 
 may_parse_srv_and_txt_records(Opts) when is_list(Opts) ->
-    maps:to_list(may_parse_srv_and_txt_records(maps:from_list(Opts)));
+    Default = #{srv_record => false},
+    maps:to_list(may_parse_srv_and_txt_records(maps:merge(Default, maps:from_list(Opts))));
 
 may_parse_srv_and_txt_records(#{type := Type,
                                 srv_record := false,

From 7e01a5245710ad291ef2fcc4f3d45a858299afbe Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 23 Mar 2022 15:56:51 +0100
Subject: [PATCH 3/4] fix: typo in function name

---
 apps/emqx_management/src/emqx_mgmt_data_backup.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/emqx_management/src/emqx_mgmt_data_backup.erl b/apps/emqx_management/src/emqx_mgmt_data_backup.erl
index d5c6c7b97..aa2cbc40f 100644
--- a/apps/emqx_management/src/emqx_mgmt_data_backup.erl
+++ b/apps/emqx_management/src/emqx_mgmt_data_backup.erl
@@ -650,7 +650,7 @@ list_backup_file() ->
     lists:filtermap(Filter, backup_files()).
 
 backup_files() ->
-    backup_files(backup_dir()) ++ backup_files(backup_dir_odl_version()).
+    backup_files(backup_dir()) ++ backup_files(backup_dir_old_version()).
 
 backup_files(Dir) ->
     {ok, FilesAll} = file:list_dir_all(Dir),
@@ -840,7 +840,7 @@ backup_dir() ->
     ok = filelib:ensure_dir(filename:join([Dir, dummy])),
     Dir.
 
-backup_dir_odl_version() ->
+backup_dir_old_version() ->
     emqx:get_env(data_dir).
 
 legal_filename(Filename) ->

From ada29de3d5235f028f8214b1bfc78d608daf39b0 Mon Sep 17 00:00:00 2001
From: "Zaiming (Stone) Shi" <zmstone@gmail.com>
Date: Wed, 23 Mar 2022 15:58:07 +0100
Subject: [PATCH 4/4] fix(appup): add changed modules

---
 apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src b/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src
index f05fa9de1..641ce3e93 100644
--- a/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src
+++ b/apps/emqx_auth_mongo/src/emqx_auth_mongo.appup.src
@@ -1,15 +1,21 @@
 %% -*- mode: erlang -*-
 %% Unless you know what you are doing, DO NOT edit manually!!
 {VSN,
-  [{"4.4.1",[{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]},
+  [{"4.4.1",
+    [{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]},
    {"4.4.0",
-    [{load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]},
      {load_module,emqx_acl_mongo,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}],
-  [{"4.4.1",[{load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]},
+  [{"4.4.1",
+    [{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]}]},
    {"4.4.0",
-    [{load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]},
+    [{load_module,emqx_auth_mongo_sup,brutal_purge,soft_purge,[]},
+     {load_module,emqx_auth_mongo_app,brutal_purge,soft_purge,[]},
      {load_module,emqx_auth_mongo,brutal_purge,soft_purge,[]},
      {load_module,emqx_acl_mongo,brutal_purge,soft_purge,[]}]},
    {<<".*">>,[]}]}.