- Adds support for GNOME 42. - Allows using go-l2tp instead of xl2tpd but we do not have the former packaged. - Removes some old cruft, allowing us to simplify the expression. https://github.com/nm-l2tp/NetworkManager-l2tp/blob/1.20.4/NEWSmain
parent
34554f6a3b
commit
e8d262d4ce
@ -1,22 +1,22 @@ |
|||||||
diff --git a/shared/utils.c b/shared/utils.c
|
diff --git a/shared/utils.c b/shared/utils.c
|
||||||
index c978a1f..d2c36cd 100644
|
index 453e277..28716a5 100644
|
||||||
--- a/shared/utils.c
|
--- a/shared/utils.c
|
||||||
+++ b/shared/utils.c
|
+++ b/shared/utils.c
|
||||||
@@ -52,7 +52,7 @@ nm_find_ipsec (void)
|
@@ -39,7 +39,7 @@ check_ipsec_daemon(const char *path)
|
||||||
|
const char *
|
||||||
|
nm_find_ipsec(void)
|
||||||
{
|
{
|
||||||
static const char *ipsec_binary_paths[] =
|
- static const char *ipsec_binary_paths[] = {"/usr/bin/ipsec",
|
||||||
{
|
+ static const char *ipsec_binary_paths[] = {"@strongswan@/bin/ipsec",
|
||||||
- "/sbin/ipsec",
|
"/sbin/ipsec",
|
||||||
+ "@strongswan@/bin/ipsec",
|
"/usr/sbin/ipsec",
|
||||||
"/usr/sbin/ipsec",
|
"/usr/local/sbin/ipsec",
|
||||||
"/usr/local/sbin/ipsec",
|
@@ -70,7 +70,7 @@ nm_find_l2tpd(NML2tpL2tpDaemon *l2tp_daemon)
|
||||||
"/sbin/strongswan",
|
"/usr/local/sbin/kl2tpd",
|
||||||
@@ -77,7 +77,7 @@ nm_find_l2tpd (void)
|
NULL};
|
||||||
{
|
|
||||||
static const char *l2tp_binary_paths[] =
|
- static const char *xl2tp_binary_paths[] = {"/usr/bin/xl2tpd",
|
||||||
{
|
+ static const char *xl2tp_binary_paths[] = {"@xl2tpd@/bin/xl2tpd",
|
||||||
- "/sbin/xl2tpd",
|
"/sbin/xl2tpd",
|
||||||
+ "@xl2tpd@/bin/xl2tpd",
|
"/usr/sbin/xl2tpd",
|
||||||
"/usr/sbin/xl2tpd",
|
"/usr/local/sbin/xl2tpd",
|
||||||
"/usr/local/sbin/xl2tpd",
|
|
||||||
NULL
|
|
||||||
|
Loading…
Reference in new issue