From d0eb9f9c0c362a84f4318d46745ba0f075a2b645 Mon Sep 17 00:00:00 2001
From: NYPD <6412879+NYPD@users.noreply.github.com>
Date: Tue, 1 Jan 2019 14:27:28 -0500
Subject: [PATCH 1/4] Fix Insurgency Sandstorm password bug

Closes #2137
---
 lgsm/config-default/config-lgsm/inssserver/_default.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index d1796d305..bfbda5f79 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -21,7 +21,7 @@ maxplayers="28"
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -password=${serverpassword} -hostname='${servername}' -log"
+parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password=${serverpassword} -hostname='${servername}' -log"
 }
 
 #### LinuxGSM Settings ####

From a411823619afba7a07f56580b80296c8f13da6ab Mon Sep 17 00:00:00 2001
From: NYPD <nypd54@outlook.com>
Date: Tue, 1 Jan 2019 15:07:59 -0500
Subject: [PATCH 2/4] Fix issue where no password is assigned

---
 lgsm/config-default/config-lgsm/inssserver/_default.cfg | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index bfbda5f79..df54c8a30 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -21,7 +21,11 @@ maxplayers="28"
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
+if [ "${serverpassword}" != "" ]; then
 parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password=${serverpassword} -hostname='${servername}' -log"
+else
+parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -hostname='${servername}' -log"
+fi
 }
 
 #### LinuxGSM Settings ####

From 7f38d35ab64d33862bf7b426cb971bae04af9ed8 Mon Sep 17 00:00:00 2001
From: NYPD <6412879+NYPD@users.noreply.github.com>
Date: Tue, 1 Jan 2019 20:04:00 -0500
Subject: [PATCH 3/4] Update _default.cfg

---
 lgsm/config-default/config-lgsm/inssserver/_default.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index df54c8a30..384d231eb 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -21,10 +21,10 @@ maxplayers="28"
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-if [ "${serverpassword}" != "" ]; then
-parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password=${serverpassword} -hostname='${servername}' -log"
-else
+if [ -z "${serverpassword}" ]; then
 parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -hostname='${servername}' -log"
+else
+parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password=${serverpassword} -hostname='${servername}' -log"
 fi
 }
 

From 14b0ff037ef009438850204f124ee85b8829eabb Mon Sep 17 00:00:00 2001
From: Daniel Gibbs <me@danielgibbs.co.uk>
Date: Sun, 6 Jan 2019 22:10:27 +0000
Subject: [PATCH 4/4] fix(inssserver): correct issue with server password

---
 .../config-lgsm/inssserver/_default.cfg               | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lgsm/config-default/config-lgsm/inssserver/_default.cfg b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
index 384d231eb..06886ed21 100644
--- a/lgsm/config-default/config-lgsm/inssserver/_default.cfg
+++ b/lgsm/config-default/config-lgsm/inssserver/_default.cfg
@@ -21,11 +21,12 @@ maxplayers="28"
 
 ## Server Start Command | https://docs.linuxgsm.com/configuration/start-parameters#additional-parameters
 fn_parms(){
-if [ -z "${serverpassword}" ]; then
-parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -hostname='${servername}' -log"
-else
-parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password=${serverpassword} -hostname='${servername}' -log"
-fi
+	# Allows serverpassword to work with parameters
+	if [ "${serverpassword}" != "NOT SET" ]; then
+		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport}?password="${serverpassword}" -hostname="${servername}" -log"
+	else
+		parms="${defaultmap}?Scenario=${defaultscenario}?MaxPlayers=${maxplayers}?Port=${port}?QueryPort=${queryport} -hostname='${servername}' -log"
+	fi
 }
 
 #### LinuxGSM Settings ####