summary refs log tree commit diff
path: root/pkgs/tools/networking/networkmanager/vpnc/fix-paths.patch
blob: 98238ac01f76d7d5226218ed6e5c5e04458c7e13 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
--- 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);