fixed the message in both its occurences, forgotten by previous commit

This commit is contained in:
Jan Safranek 2011-06-16 10:19:00 +02:00
parent 161ede3255
commit 85d4d927e5
2 changed files with 5 additions and 2 deletions

View File

@ -52,7 +52,7 @@ index 68b79f7..71de366 100644
- g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s", - g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s",
- argv[0], strerror(errno)); - argv[0], strerror(errno));
+ if (errno == EPERM || errno == EACCES) + if (errno == EPERM || errno == EACCES)
+ securitymsg = "\nAre you memeber of 'wireshark' group? Try running 'usermod -a -G wireshark <username>' as root."; + securitymsg = "\nAre you memeber of 'wireshark' group? Try running\n'usermod -a -G wireshark _your_username_' as root.";
+ g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s", + g_snprintf(errmsg, sizeof errmsg, "Couldn't run %s in child process: %s%s",
+ argv[0], strerror(errno), securitymsg); + argv[0], strerror(errno), securitymsg);
sync_pipe_errmsg_to_parent(2, errmsg, ""); sync_pipe_errmsg_to_parent(2, errmsg, "");

View File

@ -11,7 +11,7 @@
Summary: Network traffic analyzer Summary: Network traffic analyzer
Name: wireshark Name: wireshark
Version: 1.6.0 Version: 1.6.0
Release: 3%{?dist} Release: 4%{?dist}
License: GPL+ License: GPL+
Group: Applications/Internet Group: Applications/Internet
Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2 Source0: http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@ -328,6 +328,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sbindir}/idl2wrs %{_sbindir}/idl2wrs
%changelog %changelog
* Thu Jun 16 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.0-4
- fixed previous incomplete fix
* Thu Jun 16 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.0-3 * Thu Jun 16 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.0-3
- fixed Fedora-specific message when user is not part of 'wireshark' group - fixed Fedora-specific message when user is not part of 'wireshark' group
- now it does not contain '<' and '>' characters (#713545) - now it does not contain '<' and '>' characters (#713545)