diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-17 16:11:40 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-17 16:11:40 -0800 |
| commit | 25c9c0a812b29bf6b6eb58ce166f6f30311892b9 (patch) | |
| tree | 0433fd1da215302676fa899f7684a0ab95975d6e | |
| parent | 2b986b2d9078d1d199f37746c9ccede29e796ce4 (diff) | |
| parent | bdb1b547291dbe69c7953b20b85bdea901071f47 (diff) | |
| download | vyatta-cfg-quagga-25c9c0a812b29bf6b6eb58ce166f6f30311892b9.tar.gz vyatta-cfg-quagga-25c9c0a812b29bf6b6eb58ce166f6f30311892b9.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-system into jenner
| -rw-r--r-- | debian/changelog | 17 | ||||
| -rw-r--r-- | debian/vyatta-cfg-system.postinst.in | 9 | ||||
| -rw-r--r-- | templates/system/login/user/node.tag/authentication/plaintext-password/node.def | 2 |
3 files changed, 24 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 78bbc2a6..2cff94e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +vyatta-cfg-system (0.15.3-2) unstable; urgency=low + + * fix spelling mistake + + -- Mohit Mehta <mohit.mehta@vyatta.com> Tue, 10 Feb 2009 10:10:03 -0800 + +vyatta-cfg-system (0.15.3-1) unstable; urgency=low + + [ Stephen Hemminger ] + * bridge: handle non ethernet devices in bridge + + [ Mohit Mehta ] + * permit operator-level user to issue show and clear commands for + firewall + + -- Mohit Mehta <mohit.mehta@vyatta.com> Fri, 06 Feb 2009 17:45:06 -0800 + vyatta-cfg-system (0.15.3) unstable; urgency=low * Fix delete of bonding interface diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 0f699d2b..10ceac14 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -53,9 +53,12 @@ Defaults env_keep+=VYATTA_* Cmnd_Alias IPTABLES = /sbin/iptables --list -n,\ /sbin/iptables -L -vn,\ /sbin/iptables -L * -vn,\ - /sbin/iptables -t * -L -vn, \ + /sbin/iptables -t * -L *, \ /sbin/iptables -Z *,\ - /sbin/iptables -Z -t nat + /sbin/iptables -Z -t nat, \ + /sbin/iptables -t * -Z * +Cmnd_Alias IP6TABLES = /sbin/ip6tables -t * -Z *, \ + /sbin/ip6tables -t * -L * Cmnd_Alias IPFLUSH = /sbin/ip route flush cache, \ /sbin/ip route flush cache *,\ /sbin/ip neigh flush to *, \ @@ -74,7 +77,7 @@ Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff, /usr/sbin/pppstats Cmnd_Alias PCAPTURE = /usr/bin/tshark, /usr/bin/tcpdump %operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, \ PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, \ - /usr/bin/lsof, /usr/sbin/conntrack + /usr/bin/lsof, /usr/sbin/conntrack, IP6TABLES EOF cat <<EOF >>/etc/sudoers %users ALL=NOPASSWD: ${bindir}/sudo-users/ diff --git a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def index 4f309e72..d712db20 100644 --- a/templates/system/login/user/node.tag/authentication/plaintext-password/node.def +++ b/templates/system/login/user/node.tag/authentication/plaintext-password/node.def @@ -1,5 +1,5 @@ type: txt -help: Sete plaintext password for encryption +help: Set plaintext password for encryption # if plaintext is empty, assume this is left-over from blanking the plaintext # and do nothing. to set password to empty, user needs to set the # "encrypted-password" to an empty string (which actually allows login without |