Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-quagga into jenner

1 files changed, 11 insertions, 5 deletions

diff --git a/scripts/vyatta-show-protocols b/scripts/vyatta-show-protocols
index c81dcb82..4f3e0a92 100755
--- a/scripts/vyatta-show-protocols
+++ b/scripts/vyatta-show-protocols
@@ -31,7 +31,14 @@ my %actions = (
     'deleted'	 => 'isDeleted',
 );
 
-my @protocols = qw(bgp isis ospf ospf6 rip ripng);
+my %daemons = (
+    'bgp'	=> 'bgpd',
+    'ospf'	=> 'ospfd',
+    'ospfv3'	=> 'ospf6d',
+    'rip'	=> 'ripd',
+    'ripng'	=> 'ripngd',
+    'isis'	=> 'isisd',
+);
 
 sub usage {
     die "Usage: $0 {",join('|',keys %actions),"}\n"
@@ -44,8 +51,7 @@ usage unless $match;
 my $config = new Vyatta::Config;
 $config->setLevel('protocols');
     
-# Avoid the urge to do Perl Golf here...
-my @found = grep { $config->$match($_) } @protocols;
-my @daemons = map { $_ . 'd' } @found;
-print join(' ', @daemons), "\n";
+# Should have avoided the urge to do Perl golf here...
+my @found = grep { $config->$match($_) } keys %daemons;
+print join(' ', map { $daemons{$_} } @found),"\n";