diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-10-21 09:51:45 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-21 09:51:45 -0700 |
| commit | 8e8df009119b1b8867ecd4c9c536c8af2ff411dc (patch) | |
| tree | 5d4d2bc6dab8470c162de70c6ac71fa8370d3f95 | |
| parent | 964ad5ed90f9c6ec3f49d69e61b82575f0cf7fb3 (diff) | |
| parent | 256821fb454d4406e52525545b238863666e91cf (diff) | |
| download | vyatta-cfg-system-8e8df009119b1b8867ecd4c9c536c8af2ff411dc.tar.gz vyatta-cfg-system-8e8df009119b1b8867ecd4c9c536c8af2ff411dc.zip | |
Merge branch 'oxnard' of git.vyatta.com:/git/vyatta-cfg-system into changes-john-southworth
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | sysconf/filecaps | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index cbe17504..d59538c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vyatta-cfg-system (0.19.124) unstable; urgency=low + + * Bugfix 7575 allow tshark to run as unprivileged user, tshark uses + dumpcap as the packet interface so dumpcap needs cap_net_raw and + cap_net_admin + + -- John Southworth <john.southworth@vyatta.com> Thu, 20 Oct 2011 16:35:18 -0500 + vyatta-cfg-system (0.19.123) unstable; urgency=low * allow rmmod without being root (with capability) diff --git a/sysconf/filecaps b/sysconf/filecaps index 904b0938..a3471d98 100644 --- a/sysconf/filecaps +++ b/sysconf/filecaps @@ -14,6 +14,7 @@ cap_net_admin=pe /usr/sbin/brctl # Raw sockets cap_net_raw=pe /usr/bin/tshark cap_net_raw=pe /usr/sbin/tcpdump +cap_net_raw,cap_net_admin=eip /usr/bin/dumpcap # Allow changes to system settings cap_net_admin,cap_sys_admin=pe /sbin/sysctl |