Merge branch 'glendale' into hollywood

3 files changed, 59 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 0423fe81..1768fc2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,60 @@
+vyatta-cfg-system (0.3) unstable; urgency=low
+
+  VC4.0.1
+  [ Mark O'Brien ]
+
+
+  [ An-Cheng Huang ]
+  * fix for bug 2083: add radius authentication support.
+
+  [ Mark O'Brien ]
+  * Update version file to VC4.0.1
+
+  [ Mohit Mehta ]
+  * Fix Bug 2707 Missing from Glendale
+  * CLI tab enhancement at "set interfaces ethernet <> address"
+
+  [ Robert Bays ]
+  * fixes for bugs 2499, 2967
+
+  [ Stephen Hemminger ]
+  * add operator and admin to linux group adm
+  * add option to disable root login over ssh
+  * fix ssh allow-root template
+  * put operator in operator group
+  * add explicit list of commands in sudoers
+  * don't allow illegal hostnames
+  * allow numbers in hostname
+  * allow non-root to clear nat counters
+  * Replace VPL with GPLv2
+  * Changes for license/copyright
+  * Update to GPLv2
+  * Move init-floppy to /opt/vyatta/sbin
+  * Allow operator to set date.
+
+  [ Stig Thormodsrud ]
+  * Fix 2877: Bridge group can not be assiged to vif sub interfaceZ
+  * Fix parse error in /etc/sudoers
+  * Fix 2880 SNMP configuration file issues
+  * Fix 2695 GRE tunnel doesn't work with "key"
+
+  [ rbalocca ]
+  * Fix for bug #2934
+  * Fix for bug #2542 ( http://bugzilla.vyatta.com/show_bug.cgi?id=2542
+    )
+  * Fix for bug #2921 ( http://bugzilla.vyatta.com/show_bug.cgi?id=2921
+    )
+  * Revert "Fix for bug #2921 (
+    http://bugzilla.vyatta.com/show_bug.cgi?id=2921 )"
+  * Improve the package repository template
+  * Fix for bug #2969 ( http://bugzilla.vyatta.com/show_bug.cgi?id=2969
+    )
+  * Update copyright for "show version"
+
+  [ Mark O'Brien ]
+
+ -- Mark O'Brien <mobrien@vyatta.com>  Tue, 18 Mar 2008 19:03:58 -0700
+
 vyatta-cfg-system (0.2) unstable; urgency=low
 
   vc4.0.0
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index aca479ea..1c0ba92c 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -42,7 +42,7 @@ Cmnd_Alias IPFLUSH = /sbin/ip route flush cache, \
 		     /sbin/ip neigh flush to *, \
 		     /sbin/ip neigh flush dev *
 Cmnd_Alias ETHTOOLP = /usr/sbin/ethtool -p *
-%operator ALL=NOPASSWD: /sbin/reboot, /sbin/date, IPTABLES, ETHTOOLP, IPFLUSH
+%operator ALL=NOPASSWD: /sbin/reboot, /bin/date, IPTABLES, ETHTOOLP, IPFLUSH
 EOF
 
     # for "users" level (FIXME)
diff --git a/sysconf/version b/sysconf/version
index 6a988d5f..b0652ab0 100644
--- a/sysconf/version
+++ b/sysconf/version
@@ -1,2 +1 @@
-Version :    vc4.0.0
-Copyright: 2006-2008 Vyatta, Inc.
+Version :    VC4.0.1