diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-11-19 15:24:03 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-11-20 04:39:53 +0000 |
| commit | 11be78a61f0804c79ff35451edc9f2bf077733b0 (patch) | |
| tree | f2d9b0e9cbae55c5360e125a70048b8506df05bc /packaging | |
| parent | 9de7cd9f039a11770c371bbe0c22ea1c6399a299 (diff) | |
NSIS: Don't run Wireshark from the installer.
Remove the option to run Wireshark from the NSIS installer. As noted in
bug 16195, this runs Wireshark as Administrator which is something we
recommend against.
Bug: 16195
Change-Id: I0692262a611d72d9e9f9c2131ce71cc62b4737b1
Reviewed-on: https://code.wireshark.org/review/35143
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 7bab79df9c..42e260f854 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -71,8 +71,10 @@ BrandingText "Wireshark${U+00ae} Installer" !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt" !define MUI_FINISHPAGE_SHOWREADME_TEXT "Show News" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED -!define MUI_FINISHPAGE_RUN "$INSTDIR\${PROGRAM_NAME_PATH}" -!define MUI_FINISHPAGE_RUN_NOTCHECKED +; NSIS runs as Administrator and will run Wireshark as Administrator +; if these are enabled. +;!define MUI_FINISHPAGE_RUN "$INSTDIR\${PROGRAM_NAME_PATH}" +;!define MUI_FINISHPAGE_RUN_NOTCHECKED !define MUI_PAGE_CUSTOMFUNCTION_SHOW myShowCallback |