diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 01:08:36 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 01:08:36 -0600 |
| commit | 2f113ee90a8c97be2ccb70dc6738fe243dde1b84 (patch) | |
| tree | bef1f7ad895ce4c94c92bb4cd06cf57f96fa9017 /pkgs/applications/networking/sniffers | |
| parent | 3fe7b1a4c97ef0a098c0cd786386e2b547762983 (diff) | |
| download | nixlib-2f113ee90a8c97be2ccb70dc6738fe243dde1b84.tar nixlib-2f113ee90a8c97be2ccb70dc6738fe243dde1b84.tar.gz nixlib-2f113ee90a8c97be2ccb70dc6738fe243dde1b84.tar.bz2 nixlib-2f113ee90a8c97be2ccb70dc6738fe243dde1b84.tar.lz nixlib-2f113ee90a8c97be2ccb70dc6738fe243dde1b84.tar.xz nixlib-2f113ee90a8c97be2ccb70dc6738fe243dde1b84.tar.zst nixlib-2f113ee90a8c97be2ccb70dc6738fe243dde1b84.zip | |
setcap-wrapper: Minor refactor
Diffstat (limited to 'pkgs/applications/networking/sniffers')
| -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 3d38cf3b604d..549da5436e60 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 permissions-wrapper that we want to use instead of the default +dumpcap 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 permissions-wrapper that we want to use instead of the default ++ * dumpcap wrapper that we want to use instead of the default + * non-setuid dumpcap binary. + */ + if (system("command -v dumpcap >/dev/null") == 0) { |