From 86d04ccad072402cebb9f17f9aa41bead2e6fe48 Mon Sep 17 00:00:00 2001
From: Simon Smith <simonsmith5521@gmail.com>
Date: Wed, 7 Feb 2024 10:19:08 +0000
Subject: [PATCH 1/3] use strcpy_s and strcat_s instead

---
 meshcore/agentcore.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c
index f71fa77..06ca9b4 100644
--- a/meshcore/agentcore.c
+++ b/meshcore/agentcore.c
@@ -4132,8 +4132,8 @@ void MeshServer_ConnectEx(MeshAgentHostContainer *agent)
 	// Set User-Agent for proxies to identify agents and versions
 	const char* FieldData = "MeshAgent ";
 	char combined[40];
-	strcpy(combined, FieldData);
-	strcat(combined, SOURCE_COMMIT_DATE);
+	strcpy_s(combined, 40, FieldData);
+	strcat_s(combined, (int)strnlen_s(SOURCE_COMMIT_DATE, 40), SOURCE_COMMIT_DATE);
 	ILibAddHeaderLine(req, "User-Agent", 10, combined, (int)strnlen_s(combined, 50));
 
 	free(path);

From 6201d59fca395596e422d95732709d677d87dcbe Mon Sep 17 00:00:00 2001
From: Simon <simon@Simons-Mac-mini.local>
Date: Sat, 24 Feb 2024 01:55:28 +0000
Subject: [PATCH 2/3] Revert "use strcpy_s and strcat_s instead"

This reverts commit 86d04ccad072402cebb9f17f9aa41bead2e6fe48.
---
 meshcore/agentcore.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meshcore/agentcore.c b/meshcore/agentcore.c
index 06ca9b4..f71fa77 100644
--- a/meshcore/agentcore.c
+++ b/meshcore/agentcore.c
@@ -4132,8 +4132,8 @@ void MeshServer_ConnectEx(MeshAgentHostContainer *agent)
 	// Set User-Agent for proxies to identify agents and versions
 	const char* FieldData = "MeshAgent ";
 	char combined[40];
-	strcpy_s(combined, 40, FieldData);
-	strcat_s(combined, (int)strnlen_s(SOURCE_COMMIT_DATE, 40), SOURCE_COMMIT_DATE);
+	strcpy(combined, FieldData);
+	strcat(combined, SOURCE_COMMIT_DATE);
 	ILibAddHeaderLine(req, "User-Agent", 10, combined, (int)strnlen_s(combined, 50));
 
 	free(path);

From 52cf129ca43d64743181fbaf940e0b4ddb542a37 Mon Sep 17 00:00:00 2001
From: Simon Smith <simonsmith5521@gmail.com>
Date: Sun, 25 Feb 2024 20:04:58 +0000
Subject: [PATCH 3/3] fix osx agent startup

Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
---
 modules/service-manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/service-manager.js b/modules/service-manager.js
index 0a4e4ad..1e9dd9c 100644
--- a/modules/service-manager.js
+++ b/modules/service-manager.js
@@ -2936,7 +2936,7 @@ function serviceManager()
             plist += '<plist version="1.0">\n';
             plist += '  <dict>\n';
             plist += '      <key>Label</key>\n';
-            plist += ('     <string>' + options.name + '</string>\n');
+            plist += ('     <string>' + options.name + '-launchagent</string>\n');
             plist += (params + '\n');
             plist += '      <key>WorkingDirectory</key>\n';
             plist += ('     <string>' + options.workingDirectory + '</string>\n');