646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
32 lines
867 B
Diff
32 lines
867 B
Diff
--- a/properties/nm-vpnc-editor-plugin.c
|
|
+++ b/properties/nm-vpnc-editor-plugin.c
|
|
@@ -161,7 +161,7 @@
|
|
GError *error = NULL;
|
|
|
|
const char *decrypt_possible_paths[] = {
|
|
- "/usr/lib/vpnc/cisco-decrypt",
|
|
+ "@vpnc@/bin/cisco-decrypt",
|
|
"/usr/bin/cisco-decrypt",
|
|
NULL
|
|
};
|
|
--- a/src/nm-vpnc-service.c
|
|
+++ b/src/nm-vpnc-service.c
|
|
@@ -610,7 +610,7 @@
|
|
find_vpnc (void)
|
|
{
|
|
static const char *vpnc_paths[] = {
|
|
- "/usr/sbin/vpnc",
|
|
+ "@vpnc@/bin/vpnc",
|
|
"/sbin/vpnc",
|
|
"/usr/local/sbin/vpnc",
|
|
NULL
|
|
@@ -1308,7 +1308,7 @@
|
|
_LOGD (" vpnc interactive mode is %s", interactive_available ? "enabled" : "disabled");
|
|
_LOGD (" uses%s --bus-name \"%s\"", bus_name_free ? "" : " default", bus_name);
|
|
|
|
- if (system ("/sbin/modprobe tun") == -1)
|
|
+ if (system ("@kmod@/bin/modprobe tun") == -1)
|
|
exit (EXIT_FAILURE);
|
|
|
|
plugin = nm_vpnc_plugin_new (bus_name);
|