diff options
author | Parnell Springmeyer <parnell@awakenetworks.com> | 2016-09-01 19:06:21 -0500 |
---|---|---|
committer | Parnell Springmeyer <parnell@awakenetworks.com> | 2016-09-01 19:21:06 -0500 |
commit | 98c058a1ee338731d72d33f320da48c95fecd0e0 (patch) | |
tree | fe83f2050163abfe9a73ad36ac1368fbe283cd39 /pkgs/applications/networking/sniffers/wireshark | |
parent | 390ab0b3eff809052d5b9d9b5335413b36898481 (diff) |
Adapting everything for the merged permissions wrappers work.
Diffstat (limited to 'pkgs/applications/networking/sniffers/wireshark')
-rw-r--r-- | pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch index 35b54c79e8f5b..3d38cf3b604d3 100644 --- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch +++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch @@ -4,7 +4,7 @@ Date: Thu, 26 Nov 2015 21:03:35 +0100 Subject: [PATCH] Lookup dumpcap in PATH NixOS patch: Look for dumpcap in PATH first, because there may be a -dumpcap setuid-wrapper that we want to use instead of the default +dumpcap permissions-wrapper that we want to use instead of the default non-setuid dumpcap binary. Also change execv() to execvp() because we've set argv[0] to "dumpcap" @@ -27,7 +27,7 @@ index 970688e..49914d5 100644 - exename = g_strdup_printf("%s/dumpcap", progfile_dir); + /* + * NixOS patch: Look for dumpcap in PATH first, because there may be a -+ * dumpcap setuid-wrapper that we want to use instead of the default ++ * dumpcap permissions-wrapper that we want to use instead of the default + * non-setuid dumpcap binary. + */ + if (system("command -v dumpcap >/dev/null") == 0) { |