From b8c70991dea965d0913938a801e9d4e76ec61638 Mon Sep 17 00:00:00 2001 From: Saurabh Mohan Date: Tue, 18 Sep 2012 12:36:09 -0700 Subject: Bugfix 8359: When deleteing vti interface use tunnel interface mode ipip --- templates/interfaces/vti/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/interfaces/vti/node.def b/templates/interfaces/vti/node.def index 15ea2e3e..0b369f82 100644 --- a/templates/interfaces/vti/node.def +++ b/templates/interfaces/vti/node.def @@ -25,7 +25,7 @@ fi delete: if [ -d /sys/class/net/$VAR(@) ] ; then ip link set $VAR(@) down - ip tunnel del $VAR(@) mode esp + ip tunnel del $VAR(@) mode ipip fi end: -- cgit v1.2.3 From acaf4a6c2b54e5a9d5f43e4a1688b6ae1d8a0f85 Mon Sep 17 00:00:00 2001 From: Saurabh Mohan Date: Tue, 18 Sep 2012 12:36:43 -0700 Subject: 0.20.32 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a8294d8e..e9825cee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.20.32) unstable; urgency=low + + * Bugfix 8359: When deleteing vti interface use tunnel interface mode + ipip + + -- Saurabh Mohan Tue, 18 Sep 2012 12:36:43 -0700 + vyatta-cfg-system (0.20.31) unstable; urgency=low * Update /etc/hosts when host name and domain name changes -- cgit v1.2.3 From 4aebc142e0fcc4b858d73d311f96b40c6105f900 Mon Sep 17 00:00:00 2001 From: Deepti Kulkarni Date: Tue, 18 Sep 2012 16:52:40 -0700 Subject: fix for 8372 - Unclear which user ID the changed administrator password applies to fix for 8350 - Install allows installation with empty password --- scripts/install-system | 8 ++++++-- scripts/install/install-functions | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/install-system b/scripts/install-system index 860bdd1e..80e58f6c 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -1096,9 +1096,13 @@ change_password() { until [[ "$pwd1" == "$pwd2" && "$pwd1" != "vyatta" ]] do - read -p "Enter $user password:" -r -s pwd1 <>/dev/tty 2>&0 + read -p "Enter password for user '$user': " -r -s pwd1 <>/dev/tty 2>&0 echo - read -p "Retype $user password:" -r -s pwd2 <>/dev/tty 2>&0 + if [[ "$pwd1" == "" ]]; then + echo "'' is not a valid password" + continue + fi + read -p "Retype password for user '$user':" -r -s pwd2 <>/dev/tty 2>&0 echo if [ "$pwd1" != "$pwd2" ] diff --git a/scripts/install/install-functions b/scripts/install/install-functions index 9290d88b..34ced705 100755 --- a/scripts/install/install-functions +++ b/scripts/install/install-functions @@ -237,9 +237,13 @@ change_password() { local pwd2="2" until [[ "$pwd1" == "$pwd2" && "$pwd1" != "vyatta" ]]; do - read -p "Enter $user password:" -r -s pwd1 <>/dev/tty 2>&0 + read -p "Enter password for user '$user':" -r -s pwd1 <>/dev/tty 2>&0 echo - read -p "Retype $user password:" -r -s pwd2 <>/dev/tty 2>&0 + if [[ "$pwd1" == "" ]]; then + echo "'' is not a valid password" + continue + fi + read -p "Retype password for user '$user':" -r -s pwd2 <>/dev/tty 2>&0 echo if [ "$pwd1" != "$pwd2" ]; then -- cgit v1.2.3 From 3403a156b0ae0257face509fbea778c906d683d7 Mon Sep 17 00:00:00 2001 From: Deepti Kulkarni Date: Tue, 18 Sep 2012 16:58:30 -0700 Subject: 0.20.33 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index e9825cee..cbc86856 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.20.33) unstable; urgency=low + + * fix for 8372 - Unclear which user ID the changed administrator + password applies to + + -- Deepti Kulkarni Tue, 18 Sep 2012 16:58:30 -0700 + vyatta-cfg-system (0.20.32) unstable; urgency=low * Bugfix 8359: When deleteing vti interface use tunnel interface mode -- cgit v1.2.3 From ea19fe6d0b149bc50858425af4fd953dd780b18d Mon Sep 17 00:00:00 2001 From: James Davidson Date: Wed, 19 Sep 2012 11:48:03 -0700 Subject: Set hostname after updating hosts file Fixes bug 8380 --- scripts/system/vyatta_update_hosts.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/system/vyatta_update_hosts.pl b/scripts/system/vyatta_update_hosts.pl index 0fb2a914..7c8bc8e6 100755 --- a/scripts/system/vyatta_update_hosts.pl +++ b/scripts/system/vyatta_update_hosts.pl @@ -71,9 +71,6 @@ if (defined $domain_name) { } $hosts_line .= " $host_name\t #vyatta entry\n"; -set_hostname $host_name; -set_mailname $mail_name; - my ($out, $tempname) = tempfile($HOSTS_TMPL, UNLINK => 1) or die "Can't create temp file: $!"; @@ -97,3 +94,5 @@ close ($out); system("sudo cp $tempname $HOSTS_CFG") == 0 or die "Can't copy $tempname to $HOSTS_CFG: $!"; +set_hostname $host_name; +set_mailname $mail_name; -- cgit v1.2.3 From 6a0a23444df6e9026392cbaef71fa4c6ad78460c Mon Sep 17 00:00:00 2001 From: James Davidson Date: Wed, 19 Sep 2012 11:56:39 -0700 Subject: 0.20.34 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index cbc86856..1e5e1d45 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.20.34) unstable; urgency=low + + * Set hostname after updating hosts file + + -- James Davidson Wed, 19 Sep 2012 11:56:39 -0700 + vyatta-cfg-system (0.20.33) unstable; urgency=low * fix for 8372 - Unclear which user ID the changed administrator -- cgit v1.2.3 From c61e29db49e9e757f593b746723baab36a75ae49 Mon Sep 17 00:00:00 2001 From: James Davidson Date: Fri, 21 Sep 2012 14:11:49 -0700 Subject: Do not check disabled accounts for default password Fixes bug 8368 --- scripts/vyatta-first-login-passwd.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/vyatta-first-login-passwd.sh b/scripts/vyatta-first-login-passwd.sh index d75e5c0c..ab4e8ed4 100755 --- a/scripts/vyatta-first-login-passwd.sh +++ b/scripts/vyatta-first-login-passwd.sh @@ -91,14 +91,17 @@ change_password() { save } +dpwd='"*"' for user in $($API listEffectiveNodes system login user); do user=${user//\'/} epwd=$(show system login user $user authentication encrypted-password) epwd=$(awk '{ print $2 }' <<<$epwd) - salt=$(awk 'BEGIN{ FS="$" }; { print $3 }' <<<$epwd) - vyatta_epwd=$(mkpasswd -H md5 -S $salt vyatta) - if [[ $epwd == $vyatta_epwd ]]; then - change_password $user + if [[ $epwd != $dpwd ]]; then + salt=$(awk 'BEGIN{ FS="$" }; { print $3 }' <<<$epwd) + vyatta_epwd=$(mkpasswd -H md5 -S $salt vyatta) + if [[ $epwd == $vyatta_epwd ]]; then + change_password $user + fi fi done eval $(exit_configure) -- cgit v1.2.3 From 647f7b50a80925bed700525aebd225ad59319cf4 Mon Sep 17 00:00:00 2001 From: James Davidson Date: Fri, 21 Sep 2012 14:17:25 -0700 Subject: 0.20.35 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1e5e1d45..29459faf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.20.35) unstable; urgency=low + + * Do not check disabled accounts for default password + + -- James Davidson Fri, 21 Sep 2012 14:17:25 -0700 + vyatta-cfg-system (0.20.34) unstable; urgency=low * Set hostname after updating hosts file -- cgit v1.2.3