15810727 SUNBT7192237 wireshark and tshark binaries don't require extra privileges s11-update
authorPetr Sumbera <petr.sumbera@oracle.com>
Thu, 22 Nov 2012 08:06:39 -0800
branchs11-update
changeset 2430 e5c2ebd2643a
parent 2429 cf97b079f90d
child 2431 a172bfccb116
15810727 SUNBT7192237 wireshark and tshark binaries don't require extra privileges
components/wireshark/exec_attr.tshark
components/wireshark/exec_attr.wireshark
components/wireshark/patches/DesktopEntry.patch
components/wireshark/tshark.p5m
components/wireshark/wireshark.p5m
--- a/components/wireshark/exec_attr.tshark	Thu Nov 22 06:15:30 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Network Management:solaris:cmd:RO::/usr/sbin/tshark:privs=net_rawaccess
--- a/components/wireshark/exec_attr.wireshark	Thu Nov 22 06:15:30 2012 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-Network Management:solaris:cmd:RO::/usr/sbin/wireshark:privs=net_rawaccess
--- a/components/wireshark/patches/DesktopEntry.patch	Thu Nov 22 06:15:30 2012 -0800
+++ b/components/wireshark/patches/DesktopEntry.patch	Thu Nov 22 08:06:39 2012 -0800
@@ -7,7 +7,7 @@
 -TryExec=wireshark
 -Exec=wireshark %f
 +TryExec=/usr/sbin/wireshark
-+Exec=/usr/sbin/wireshark %f
++Exec=pfexec /usr/sbin/wireshark %f
  Terminal=false
  MimeType=application/vnd.tcpdump.pcap;
  # Categorie entry according to version 1.0 of
--- a/components/wireshark/tshark.p5m	Thu Nov 22 06:15:30 2012 -0800
+++ b/components/wireshark/tshark.p5m	Thu Nov 22 08:06:39 2012 -0800
@@ -32,14 +32,10 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=etc/security
-dir path=etc/security/exec_attr.d
 dir path=usr/sbin
 dir path=usr/share
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file exec_attr.tshark path=etc/security/exec_attr.d/diagnostic:wireshark:tshark
 file path=usr/sbin/tshark
 file path=usr/share/man/man1/tshark.1
 
--- a/components/wireshark/wireshark.p5m	Thu Nov 22 06:15:30 2012 -0800
+++ b/components/wireshark/wireshark.p5m	Thu Nov 22 08:06:39 2012 -0800
@@ -32,9 +32,6 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2007/334
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=etc/security
-dir path=etc/security/exec_attr.d
 dir path=usr
 dir path=usr/sbin
 dir path=usr/share
@@ -42,7 +39,6 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/pixmaps
-file exec_attr.wireshark path=etc/security/exec_attr.d/diagnostic:wireshark
 file path=usr/sbin/wireshark
 file wireshark-$(IPS_COMPONENT_VERSION)/wireshark.desktop \
     path=usr/share/applications/wireshark.desktop