Merge branch 'glendale' into hollywood

2 files changed, 19 insertions, 17 deletions

diff --git a/debian/copyright b/debian/copyright
index 8690d57f..f12deb1f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,21 +14,22 @@ Copyright:
 
 License:
 
- The contents of this package are subject to the Vyatta Public License
- Version 1.0 ("License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.vyatta.com/vpl
-
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and limitations
- under the License.
-
- This code was originally developed by Vyatta, Inc.
- Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+A copy of the GNU General Public License is available as
+`/usr/share/common-licenses/GPL' in the Debian GNU/Linux distribution
+or on the World Wide Web at `http://www.gnu.org/copyleft/gpl.html'.
+You can also obtain it by writing to the Free Software Foundation,
+Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+MA 02110-1301, USA.
 
 The Debian packaging is (C) 2007, An-Cheng Huang <ancheng@vyatta.com> and
 is licensed under the GPL, see above.
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index ad9c5fda..979760f6 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -32,10 +32,11 @@ if [ "$sysconfdir" != "/etc" ]; then
     # Allow operator to do a limited number of commands without password
     cat <<"EOF" >>/etc/sudoers
 Cmnd_Alias IPTABLES = /sbin/iptables --list -n,\
-                      /sbin/iptables -Z *,\
 		      /sbin/iptables -L -vn,\
                       /sbin/iptables -L * -vn,\
-		      /sbin/iptables -t * -L -vn
+		      /sbin/iptables -t * -L -vn, \
+                      /sbin/iptables -Z *,\
+		      /sbin/iptables -Z -t nat
 Cmnd_Alias IPFLUSH = /sbin/ip route flush cache, \
 		     /sbin/ip route flush cache *,\
 		     /sbin/ip neigh flush to *, \