summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-04-27 15:26:01 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-04-27 15:26:01 -0700
commitfddfbe9ca26b542ee31ba7b281f892708fa1459f (patch)
tree3c2d909ae09a95dff93811b39cd16da8719a1cec
parent845d1bd87be28deb65db22e47e29ba7a89c37b4b (diff)
downloadvyatta-cfg-system-fddfbe9ca26b542ee31ba7b281f892708fa1459f.tar.gz
vyatta-cfg-system-fddfbe9ca26b542ee31ba7b281f892708fa1459f.zip
Revert "Set capabilities on standard utilities"
This reverts commit 59cae244d055a7b5ba9de460d3ebbb5700d6ab17. Don't want to do this this way.
-rw-r--r--debian/control1
-rw-r--r--debian/vyatta-cfg-system.postinst.in11
2 files changed, 0 insertions, 12 deletions
diff --git a/debian/control b/debian/control
index 57fdb2c7..c1d19a95 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Depends: acpid,
vyatta-keepalived (>= 1.1.15-1-vyatta-5),
bridge-utils,
ethtool,
- libcap2-bin,
ssh (>= 1:5.1p1-5),
openssh-server (>= 1:5.1p1-5),
ed,
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 288ea7c5..b2719bc5 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -154,17 +154,6 @@ dpkg-reconfigure -f noninteractive openssh-server
rm -f /etc/ssh/*.broken
update-rc.d -f ssh remove >/dev/null
-#
-# Set extended capabilities on some files
-setcap cap_net_admin+e /usr/sbin/ethtool
-setcap cap_sys_admin+e /sbin/sysctl
-setcap cap_audit_write+e /bin/vbash
-setcap cap_net_admin+e /sbin/ip
-setcap cap_net_admin+e /sbin/tc cap_net_admin+e /sbin/ip
-setcap cap_net_admin+e /usr/sbin/arp
-setcap cap_net_admin+e /sbin/iptables cap_net_admin+e /sbin/ip6tables
-setcap cap_net_admin+e /usr/sbin/conntrack
-
# Fix up PAM configuration for login so that invalid users are prompted
# for password
sed -i 's/requisite[ \t][ \t]*pam_securetty.so/required pam_securetty.so/' $rootfsdir/etc/pam.d/login