Merge 06e79fd75d into e475d70c0b

Merge pull request #2056 from nynauy/nynauy-systemd-patch
Correct and simplify systemd service files
2024-11-24 02:19:52 +03:00 · 2024-10-06 03:15:36 -04:00 · 2024-09-24 16:47:23 +02:00 · 2024-09-21 21:59:10 +02:00 · 2024-09-17 07:03:19 +08:00 · 2024-08-15 04:28:13 -04:00
6 changed files with 14 additions and 18 deletions
--- a/src/Mayaqua/Microsoft.c
+++ b/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) &&
-			(ms->IsNt == false))
+			(IsNt() == false))
 		{
 			// Tried to use the command for the NT in non-WindowsNT system
 			MsgBox(NULL, MB_ICONSTOP, _UU("SVC_NT_ONLY"));
--- a/src/Mayaqua/Microsoft.h
+++ b/src/Mayaqua/Microsoft.h
@ -170,7 +170,6 @@ typedef struct MS
 {
 	HINSTANCE hInst;
 	HINSTANCE hKernel32;
-	bool IsNt;
 	bool IsAdmin;
 	HANDLE hCurrentProcess;
 	UINT CurrentProcessId;
--- a/src/vpncmd/vpncmd.c
+++ b/src/vpncmd/vpncmd.c
@ -6,7 +6,9 @@
 // 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"
@ -39,6 +41,10 @@ int main(int argc, char *argv[])
 #endif
 	InitCedar();

+#ifdef OS_WIN32
+	CmExecUiHelperMain();
+#endif
+
 	s = GetCommandLineUniStr();

 	if (s == NULL)
--- a/systemd/softether-vpnbridge.service
+++ b/systemd/softether-vpnbridge.service
@ -4,11 +4,8 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnbridge/do_not_run

 [Service]
-Type=forking
-EnvironmentFile=-@DIR@/softether/vpnbridge
-ExecStart=@DIR@/softether/vpnbridge/vpnbridge start
-ExecStop=@DIR@/softether/vpnbridge/vpnbridge stop
-KillMode=process
+Type=exec
+ExecStart=@DIR@/softether/vpnbridge/vpnbridge execsvc
 Restart=on-failure

 # Hardening
--- a/systemd/softether-vpnclient.service
+++ b/systemd/softether-vpnclient.service
@ -4,11 +4,8 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnclient/do_not_run

 [Service]
-Type=forking
-EnvironmentFile=-@DIR@/softether/vpnclient
-ExecStart=@DIR@/softether/vpnclient/vpnclient start
-ExecStop=@DIR@/softether/vpnclient/vpnclient stop
-KillMode=process
+Type=exec
+ExecStart=@DIR@/softether/vpnclient/vpnclient execsvc
 Restart=on-failure

 # Hardening
--- a/systemd/softether-vpnserver.service
+++ b/systemd/softether-vpnserver.service
@ -4,12 +4,9 @@ After=network.target auditd.service
 ConditionPathExists=!@DIR@/softether/vpnserver/do_not_run

 [Service]
-Type=forking
+Type=exec
 TasksMax=infinity
-EnvironmentFile=-@DIR@/softether/vpnserver
-ExecStart=@DIR@/softether/vpnserver/vpnserver start
-ExecStop=@DIR@/softether/vpnserver/vpnserver stop
-KillMode=process
+ExecStart=@DIR@/softether/vpnserver/vpnserver execsvc
 Restart=on-failure

 # Hardening
Author	SHA1	Message	Date
Kitano-Kaneko, Naoki	25c84eaafe	Merge `06e79fd75d` into `e475d70c0b`	2024-10-06 03:15:36 -04:00
Ilya Shipitsin	e475d70c0b	Merge pull request #2056 from nynauy/nynauy-systemd-patch Correct and simplify systemd service files	2024-09-24 16:47:23 +02:00
Ilya Shipitsin	e94240d9a0	Merge pull request #2033 from siddharth-narayan/nt-fix Fix "Not on NT" error message and add uihelp to vpncmd	2024-09-21 21:59:10 +02:00
nynauy	023eb3465d	Correct and simplify systemd service files Remove unnecessary wrappers and change to start services directly. Also remove misused "EnvironmentFile" and unrecommended "KillMode=process".	2024-09-17 07:03:19 +08:00
siddharth-narayan	27d233a522	Merge branch 'SoftEtherVPN:master' into nt-fix	2024-08-15 04:28:13 -04:00
Siddharth	128fefc63e	Add UI helper to vpncmd on Windows	2024-08-15 04:26:15 -04:00
Siddharth	3a25c6bf73	Fix incorrect "Not on NT" error messages	2024-07-17 15:16:11 -07:00