Merge remote-tracking branch 'origin/master' into new_libcxx_version

Author: Noremos

.github/workflows/main.yml

@@ -289,7 +289,7 @@ jobs:
 
   build-macos:
     name: build-macos-${{ matrix.arch }}
-    runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-12' }}
+    runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
 
     strategy:
       fail-fast: false

src/burp/BurpTasks.cpp

@@ -868,6 +868,7 @@ void RestoreRelationTask::initItem(BurpGlobals* tdgbl, Item& item)
 	tdgbl->gbl_stat_flags = m_masterGbl->gbl_stat_flags;
 	tdgbl->verboseInterval = m_masterGbl->verboseInterval;
 	tdgbl->RESTORE_format = m_masterGbl->RESTORE_format;
+	tdgbl->runtimeODS = m_masterGbl->runtimeODS;
 
 	if (item.m_ownAttach)
 	{

src/remote/client/interface.cpp

@@ -7400,9 +7400,6 @@ static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned
  *
  **************************************/
 
-	rem_port* port = NULL;
-	int inet_af = AF_UNSPEC;
-
 	cBlock.loadClnt(pb, &parSet);
 	pb.deleteWithTag(parSet.auth_block);
 
@@ -7414,8 +7411,12 @@ static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned
 	Auth::setLegacySSP(legacySSP);
 #endif
 
+	rem_port* port;
 	while (true)
 	{
+		port = NULL;
+		int inet_af = AF_UNSPEC;
+
 		authenticateStep0(cBlock);
 		const NoCaseString savePluginName(cBlock.plugins.name());