Imported from rancid-2.3.2a2.tar.gz.rancid-2.3.2a2

1 files changed, 57 insertions, 52 deletions

diff --git a/bin/nrancid.in b/bin/nrancid.in
index 3f2b224..b7305e5 100644
--- a/bin/nrancid.in
+++ b/bin/nrancid.in
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: nrancid.in,v 1.17 2004/10/15 08:56:01 afort Exp $
+## $Id: nrancid.in,v 1.23 2005/06/24 16:01:19 heas Exp $
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -21,7 +21,7 @@
 #
 # Amazingly hacked version of Hank's rancid - this one tries to
 # deal with Netscreen firewalls
-# 
+#
 # Original Netscreen hacks implemented by Stephen Gill [gillsr@yahoo.com]
 #
 #  RANCID - Really Awesome New Cisco confIg Differ
@@ -35,15 +35,16 @@ $debug = $opt_d;
 $file = $opt_f;
 $host = $ARGV[0];
 $found_end = 0;
-$timeo = 90;			# nlogin timeout in seconds
+$timeo = 90;				# nlogin timeout in seconds
 
-my(%filter_pwds);		# password filtering mode
+my(@commandtable, %commands, @commands);# command lists
+my(%filter_pwds);			# password filtering mode
 
-# This routine is used to print out the firewall configuration
+# This routine is used to print out the router configuration
 sub ProcessHistory {
-    my($new_hist_tag,$new_command,$command_string,@string)=(@_);
-    if((($new_hist_tag ne $hist_tag) || ($new_command ne $command))
-       && defined %history) {
+    my($new_hist_tag,$new_command,$command_string,@string) = (@_);
+    if ((($new_hist_tag ne $hist_tag) || ($new_command ne $command))
+	&& defined %history) {
 	print eval "$command \%history";
 	undef %history;
     }
@@ -65,10 +66,10 @@ sub ProcessHistory {
 
 sub numerically { $a <=> $b; }
 
-# This is a sort routing that will sort numerically on the
+# This is a sort routine that will sort numerically on the
 # keys of a hash as if it were a normal array.
 sub keynsort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $key (sort numerically keys(%lines)) {
@@ -78,10 +79,10 @@ sub keynsort {
     @sorted_lines;
 }
 
-# This is a sort routing that will sort on the
+# This is a sort routine that will sort on the
 # keys of a hash as if it were a normal array.
 sub keysort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $key (sort keys(%lines)) {
@@ -91,22 +92,22 @@ sub keysort {
     @sorted_lines;
 }
 
-# This is a sort routing that will sort on the
+# This is a sort routine that will sort on the
 # values of a hash as if it were a normal array.
 sub valsort{
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $key (sort values %lines) {
-        $sorted_lines[$i] = $key;
-        $i++;
+	$sorted_lines[$i] = $key;
+	$i++;
     }
     @sorted_lines;
 }
 
-# This is a numerical sort routing (ascending).
+# This is a numerical sort routine (ascending).
 sub numsort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $num (sort {$a <=> $b} keys %lines) {
@@ -120,7 +121,7 @@ sub numsort {
 # ip address when the ip address is anywhere in
 # the strings.
 sub ipsort {
-    local(%lines)=@_;
+    local(%lines) = @_;
     local($i) = 0;
     local(@sorted_lines);
     foreach $addr (sort sortbyipaddr keys %lines) {
@@ -133,7 +134,7 @@ sub ipsort {
 # These two routines will sort based upon IP addresses
 sub ipaddrval {
     my(@a) = ($_[0] =~ m#^(\d+)\.(\d+)\.(\d+)\.(\d+)$#);
-    $a[3]+256*($a[2]+256*($a[1]+256*$a[0]));
+    $a[3] + 256 * ($a[2] + 256 * ($a[1] +256 * $a[0]));
 }
 sub sortbyipaddr {
     &ipaddrval($a) <=> &ipaddrval($b);
@@ -150,20 +151,20 @@ sub GetSystem {
 	# throw away the pager lines
 	next if /^--- more ---/;
 
-        /^Serial Number: (\d+), Control Number: \d+$/ &&
-                ProcessHistory("SYSTEM","","", "!SN: $1\n") && next;
-        /^Product Name: (\S+)$/ &&
-                ProcessHistory("SYSTEM","","", "!Product: $1\n") && next;
-        /^Hardware Version: (\S+), / &&
-                ProcessHistory("SYSTEM","","", "!HW: $1\n") && next;
-        /^Software Version: (\S+), Type: (\S+)$/ &&
-                ProcessHistory("SYSTEM","","", "!Netscreen Type: $2\n!Software Version: $1\n") && next;
-        /^Image: (\S+), / &&
-                ProcessHistory("SYSTEM","","", "!Image: $1\n") && next;
-        /^Feature: (\S+)$/ &&
-                ProcessHistory("SYSTEM","","", "!Feature: $1\n") && next;
-        /^File Name: (\S+), Checksum: (\S+)$/ &&
-                ProcessHistory("SYSTEM","","", "!File Name: $1, Checksum: $2\n") && next;
+	/^Serial Number: (\d+), Control Number: \d+$/ &&
+		ProcessHistory("SYSTEM","","", "!SN: $1\n") && next;
+	/^Product Name: (\S+)$/ &&
+		ProcessHistory("SYSTEM","","", "!Product: $1\n") && next;
+	/^Hardware Version: (\S+), / &&
+		ProcessHistory("SYSTEM","","", "!HW: $1\n") && next;
+	/^Software Version: (\S+), Type: (\S+)$/ &&
+		ProcessHistory("SYSTEM","","", "!Netscreen Type: $2\n!Software Version: $1\n") && next;
+	/^Image: (\S+), / &&
+		ProcessHistory("SYSTEM","","", "!Image: $1\n") && next;
+	/^Feature: (\S+)$/ &&
+		ProcessHistory("SYSTEM","","", "!Feature: $1\n") && next;
+	/^File Name: (\S+), Checksum: (\S+)$/ &&
+		ProcessHistory("SYSTEM","","", "!File Name: $1, Checksum: $2\n") && next;
 
     }
     ProcessHistory("SYSTEM","","","!\n");
@@ -190,18 +191,23 @@ sub GetConf {
 	next if /^--- more ---/;
 
  	if (/^set admin name "(\S+)"$/ && $filter_pwds >= 1) {
-            ProcessHistory("ADMIN","","","!set admin name <removed>\n");
-            next;
-        }
+	    ProcessHistory("ADMIN","","","!set admin name <removed>\n");
+	    next;
+	}
  	if (/^set admin password (\S+)$/ && $filter_pwds >= 1) {
-            ProcessHistory("ADMIN","","","!set admin password <removed>\n");
-            next;
-        }
+	    ProcessHistory("ADMIN","","","!set admin password <removed>\n");
+	    next;
+	}
  	if (/^set admin user (\S+) password (\S+) privilege (\S+)$/ &&
 							$filter_pwds >= 1) {
-            ProcessHistory("ADMIN","","",
+	    ProcessHistory("ADMIN","","",
 		"!set admin user $1 password <removed> privilege $3\n");
-            next;
+	    next;
+	}
+	if (/^set auth-server (\S+) radius secret / && $filter_pwds >= 1 ) {
+	    ProcessHistory("ADMIN","","",
+			   "!set auth-server $1 radius secret <removed>\n");
+	    next;
 	}
 	ProcessHistory("","","","$_");
     }
@@ -213,16 +219,15 @@ sub GetConf {
 sub DoNothing {print STDOUT;}
 
 # Main
-%commands=(
-	'get system'		=> "GetSystem",
-	'get conf'		=> "GetConf"
-);
-# keys() doesnt return things in the order entered and the order of the
-# cmds is important. pita
-@commands=(
-	"get system",
-	"get conf"
+@commandtable = (
+	{'get system'		=> 'GetSystem'},
+	{'get conf'		=> 'GetConf'}
 );
+# Use an array to preserve the order of the commands and a hash for mapping
+# commands to the subroutine and track commands that have been completed.
+@commands = map(keys(%$_), @commandtable);
+%commands = map(%$_, @commandtable);
+
 $cisco_cmds=join(";",@commands);
 $cmds_regexp=join("|",@commands);
 
@@ -248,7 +253,7 @@ if ($file) {
 
 # determine password filtering mode
 if ($ENV{"FILTER_PWDS"} =~ /no/i) {
-    $filter_pwds = 0;  
+    $filter_pwds = 0;
 } elsif ($ENV{"FILTER_PWDS"} =~ /all/i) {
     $filter_pwds = 2;
 } else {