Merge d6d0f2dadd into 5d1ce1a2cd

src/Mayaqua/Microsoft.c

@@ -4259,7 +4259,7 @@ UINT MsService(char *name, SERVICE_FUNCTION *start, SERVICE_FUNCTION *stop, UINT
 
 		if ((mode == SVC_MODE_INSTALL || mode == SVC_MODE_UNINSTALL || mode == SVC_MODE_START ||
 			mode == SVC_MODE_STOP || mode == SVC_MODE_SERVICE) &&
-			(IsNt() == false))
+			(ms->IsNt == false))
 		{
 			// Tried to use the command for the NT in non-WindowsNT system
 			MsgBox(NULL, MB_ICONSTOP, _UU("SVC_NT_ONLY"));

src/Mayaqua/Microsoft.h

@@ -170,6 +170,7 @@ typedef struct MS
 {
 	HINSTANCE hInst;
 	HINSTANCE hKernel32;
+	bool IsNt;
 	bool IsAdmin;
 	HANDLE hCurrentProcess;
 	UINT CurrentProcessId;

src/vpncmd/vpncmd.c

@@ -6,9 +6,7 @@
 // VPN Command Line Management Utility
 
 #include "Cedar/Cedar.h"
-#ifdef OS_WIN32
-#include "Cedar/CMInner.h"
-#endif
+
 #include "Cedar/Command.h"
 
 #include "Mayaqua/Internat.h"
@@ -41,10 +39,6 @@ int main(int argc, char *argv[])
 #endif
 	InitCedar();
 
-#ifdef OS_WIN32
-	CmExecUiHelperMain();
-#endif
-
 	s = GetCommandLineUniStr();
 
 	if (s == NULL)

systemd/softether-vpnbridge.service

@@ -4,8 +4,11 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnbridge/do_not_run
 
 [Service]
-Type=exec
-ExecStart=@DIR@/softether/vpnbridge/vpnbridge execsvc
+Type=forking
+EnvironmentFile=-@DIR@/softether/vpnbridge
+ExecStart=@DIR@/softether/vpnbridge/vpnbridge start
+ExecStop=@DIR@/softether/vpnbridge/vpnbridge stop
+KillMode=process
 Restart=on-failure
 
 # Hardening

systemd/softether-vpnclient.service

@@ -4,8 +4,11 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnclient/do_not_run
 
 [Service]
-Type=exec
-ExecStart=@DIR@/softether/vpnclient/vpnclient execsvc
+Type=forking
+EnvironmentFile=-@DIR@/softether/vpnclient
+ExecStart=@DIR@/softether/vpnclient/vpnclient start
+ExecStop=@DIR@/softether/vpnclient/vpnclient stop
+KillMode=process
 Restart=on-failure
 
 # Hardening

systemd/softether-vpnserver.service

@@ -4,9 +4,12 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnserver/do_not_run
 
 [Service]
-Type=exec
+Type=forking
 TasksMax=infinity
-ExecStart=@DIR@/softether/vpnserver/vpnserver execsvc
+EnvironmentFile=-@DIR@/softether/vpnserver
+ExecStart=@DIR@/softether/vpnserver/vpnserver start
+ExecStop=@DIR@/softether/vpnserver/vpnserver stop
+KillMode=process
 Restart=on-failure
 
 # Hardening