From 5cc1b90a447225b712da21c554861f56b713e3c8 Mon Sep 17 00:00:00 2001 From: erusman Date: Tue, 7 Jul 2020 19:53:24 -0700 Subject: [PATCH 1/3] add change to libxm12 parser.h out of extern C for newer gcc build --- .../src/shared/CustomerServiceInterface.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h index bdb22baf..5e4d7833 100755 --- a/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h +++ b/engine/server/application/CustomerServiceServer/src/shared/CustomerServiceInterface.h @@ -9,9 +9,9 @@ #include "sharedFoundation/NetworkId.h" #include "sharedNetworkMessages/CustomerServiceCategory.h" #include - -extern "C" { #include "libxml/parser.h" +extern "C" { + } using namespace CSAssist; From a9ffeca8c3f1e653add9766ceaec5bd00ff585e6 Mon Sep 17 00:00:00 2001 From: Elour Date: Tue, 25 Aug 2020 13:53:51 -0700 Subject: [PATCH 2/3] fixes server crashing on /reloadadmin reloading the table would crash the next time a call to getAdminLevel happened --- .../library/serverUtility/src/shared/AdminAccountManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp b/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp index 2f6d47ad..e7bc6631 100755 --- a/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp +++ b/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp @@ -160,6 +160,7 @@ void AdminAccountManager::reload() DEBUG_FATAL(!ms_installed, ("AdminAccountManager not installed")); NOT_NULL(ms_dataTableName); DataTableManager::reload(*ms_dataTableName); + ms_adminTable = DataTableManager::getTable (dataTableName, true); } //----------------------------------------------------------------------- From 625e4d168f24aa2590c6fe4ac78e7a1164e5b03f Mon Sep 17 00:00:00 2001 From: Elour Date: Wed, 26 Aug 2020 05:49:09 -0700 Subject: [PATCH 3/3] fixes error with admin reload oops, blour can't read --- .../library/serverUtility/src/shared/AdminAccountManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp b/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp index e7bc6631..2118aa18 100755 --- a/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp +++ b/engine/server/library/serverUtility/src/shared/AdminAccountManager.cpp @@ -160,7 +160,7 @@ void AdminAccountManager::reload() DEBUG_FATAL(!ms_installed, ("AdminAccountManager not installed")); NOT_NULL(ms_dataTableName); DataTableManager::reload(*ms_dataTableName); - ms_adminTable = DataTableManager::getTable (dataTableName, true); + ms_adminTable = DataTableManager::getTable (ms_dataTableName->c_str(), true); } //-----------------------------------------------------------------------