From adb56a3213db91c65d261e1c1165634da15975a8 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Wed, 17 Sep 2008 15:49:12 -0700
Subject: Add entry for upcoming bonding

Need to load bonding in correct step.
---
 scripts/VyattaConfigLoad.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm
index b1b7598..5305dc8 100755
--- a/scripts/VyattaConfigLoad.pm
+++ b/scripts/VyattaConfigLoad.pm
@@ -35,6 +35,7 @@ my %config_rank  = (
     'system host-name'          => 1005,
     'interfaces'                => 1000,
     'interfaces bridge'         => 990,
+    'interfaces bonding'	=> 995,
     'interfaces ethernet'       => 980,
     'interfaces tunnel'         => 910,
     'system gateway-address'    => 890,
-- 
cgit v1.2.3


From 1929ccae6812ddbd2198791d76bc3e32133bed7d Mon Sep 17 00:00:00 2001
From: Mohit Mehta <mohit.mehta@vyatta.com>
Date: Tue, 7 Oct 2008 18:35:46 -0700
Subject: Fix Bug 3770 vpn pre-shared keys should be obscured in "show
 configuration"

---
 scripts/VyattaConfigOutput.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/VyattaConfigOutput.pm b/scripts/VyattaConfigOutput.pm
index 1933d22..fa0b274 100755
--- a/scripts/VyattaConfigOutput.pm
+++ b/scripts/VyattaConfigOutput.pm
@@ -75,7 +75,7 @@ sub displayValues {
       $default = $txt;
     }
   }
-  my $is_password = ($name =~ /^.*password$/);
+  my $is_password = ($name =~ /^.*(password|pre-shared-secret)$/);
   my $HIDE_PASSWORD = '****************';
   $config->setLevel(join ' ', @cur_path);
   if ($is_multi) {
-- 
cgit v1.2.3