Imported from rancid-2.3.6.tar.gz

CHANGES

@@ -1,7 +1,76 @@
+2.3.6
+	rancid: fail on error opening nvram:
+
+	rancid: skip ASA 5520 configuration author line
+
+	control_rancid: for svn stupidity, run update (yes update) and commit
+	after setting svn:ignore, else . is out of date.
+
+	rancid: filter auto "rogue ap" configuration - Kevin Nesbitt
+
+	alogin: adjust match of active alarms msg at login
+
+	jrancid: patch for master/backup matching on EX series - Sven Engelhardt
+
+	rancid: update cisco WAE identity string match - from Jim Hock
+
+	{xr}rancid: summarize DirSlotN() bytes free as GB, else MB.
+
+	rancid: filter sflog from DirSlotN() for IOS on cisco 10k
+
+	fnrancid: update recent fortinet software - Diego Ercolani
+
+	rancid: ignore show flash on IOS XE - Marcus Stoegbauer
+
+	rancid: copy the dhcp database filter to ShowFlash() - From Lee
+
+	clogin: Fix pasto in IOS terminal width command.
+
+	hlogin: -r missing from usage o/p - Per-Olof Olsson
+
+	clogin: add -r and passphrase/identfile from cloginrc - Per-Olof Olsson
+
+	francid: remove system uptime line on CER 3000 - Simon Leinen
+
+2.3.5
+	alogin: respond to active alarms msg at login - Vincent Tamet
+
+	*rancid: update for grammar deprecated in perl 5.12
+
+	*login: handle noenable value consistently, '1' to turn it on
+
+	configure: look for -n <count> option to ping, for Windows ping (over
+	cygwin) - From Lee
+
+	rancid: missed case fpr accepting '>' prompt, rather than just '#'
+
+	xrrancid: filter sequences from ipv4/6 access-lists
+
+	zrancid: force terminal type vt100 so as not to confuse Linux
+
+	francid: filter system uptime on new Brocades - Matthias Cramer
+
+	rancid: filter ASA time-based license noise - Christopher DeRemer
+
+	rancid: filter command in WriteTerm if echoed - Arjan Oosting
+
+	configure: specifically look for ping in /sbin & /usr/sbin & fix typo
+	in test operator
+
+	rancid: handle a few IOS serial number formatting variants - Aaron Rees
+
+	hpuifilter: change filtering to avoid use of string functions due to a
+	Debian bug.  Should be faster too.
+
+	rancid: adjust show inventory matches for variables WS - Aaron Rees
+
+	nxrancid: show environment clock and show core vdc-all are not valid
+	commands on all platforms - Ryan West
+
 2.3.4
-	nracnid: fix serial number matching - Nathan Wallwork
+	nrancid: fix serial number matching - Nathan Wallwork
 
-	nracnid: fix pager prompt filtering - Nathan Wallwork
+	nrancid: fix pager prompt filtering - Nathan Wallwork
 
 	rancid: remove sequences from IPv6 prefix-lists
 

bin/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## A Makefile.in is supplied, in case you do not have automake.
 
-## $Id: Makefile.am 2178 2010-04-08 20:03:01Z heas $
+## $Id: Makefile.am 2258 2010-10-11 20:49:05Z heas $
 ##
 ## Copyright (c) 1997-2008 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -51,9 +51,9 @@ AUTOMAKE_OPTIONS=foreign
 bin_PROGRAMS = hpuifilter
 bin_SCRIPTS = agmrancid alogin arancid arrancid avologin avorancid blogin \
 	brancid cat5rancid clogin control_rancid cssrancid elogin erancid \
-	f5rancid f10rancid flogin fnrancid francid hlogin hrancid htlogin \
-	htrancid jerancid jlogin jrancid mrancid mrvlogin mrvrancid nlogin \
-	nrancid nslogin nsrancid nxrancid par prancid rancid-fe rancid \
+	f5rancid f10rancid flogin fnlogin fnrancid francid hlogin hrancid \
+	htlogin htrancid jerancid jlogin jrancid mrancid mrvlogin mrvrancid \
+	nlogin nrancid nslogin nsrancid nxrancid par prancid rancid-fe rancid \
 	rivlogin rivrancid rrancid srancid tlogin tntlogin tntrancid trancid \
 	xrancid xrrancid zrancid
 

bin/Makefile.in

@@ -50,12 +50,13 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/control_rancid.in $(srcdir)/cssrancid.in \
 	$(srcdir)/elogin.in $(srcdir)/erancid.in \
 	$(srcdir)/f10rancid.in $(srcdir)/f5rancid.in \
-	$(srcdir)/flogin.in $(srcdir)/fnrancid.in $(srcdir)/francid.in \
-	$(srcdir)/hlogin.in $(srcdir)/hrancid.in $(srcdir)/htlogin.in \
-	$(srcdir)/htrancid.in $(srcdir)/jerancid.in \
-	$(srcdir)/jlogin.in $(srcdir)/jrancid.in $(srcdir)/mrancid.in \
-	$(srcdir)/mrvlogin.in $(srcdir)/mrvrancid.in \
-	$(srcdir)/nlogin.in $(srcdir)/nrancid.in $(srcdir)/nslogin.in \
+	$(srcdir)/flogin.in $(srcdir)/fnlogin.in $(srcdir)/fnrancid.in \
+	$(srcdir)/francid.in $(srcdir)/hlogin.in $(srcdir)/hrancid.in \
+	$(srcdir)/htlogin.in $(srcdir)/htrancid.in \
+	$(srcdir)/jerancid.in $(srcdir)/jlogin.in $(srcdir)/jrancid.in \
+	$(srcdir)/mrancid.in $(srcdir)/mrvlogin.in \
+	$(srcdir)/mrvrancid.in $(srcdir)/nlogin.in \
+	$(srcdir)/nrancid.in $(srcdir)/nslogin.in \
 	$(srcdir)/nsrancid.in $(srcdir)/nxrancid.in $(srcdir)/par.in \
 	$(srcdir)/prancid.in $(srcdir)/rancid-fe.in \
 	$(srcdir)/rancid.in $(srcdir)/rivlogin.in \
@@ -74,11 +75,11 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES = control_rancid par rancid-fe agmrancid alogin \
 	arancid arrancid avologin avorancid blogin brancid cat5rancid \
 	clogin rancid cssrancid elogin erancid f5rancid f10rancid \
-	flogin francid fnrancid hlogin hrancid htlogin htrancid jlogin \
-	jrancid jerancid mrancid mrvlogin mrvrancid nlogin nrancid \
-	nslogin nsrancid nxrancid prancid rivlogin rivrancid rrancid \
-	srancid tlogin tntlogin tntrancid trancid xrancid xrrancid \
-	zrancid
+	flogin francid fnlogin fnrancid hlogin hrancid htlogin \
+	htrancid jlogin jrancid jerancid mrancid mrvlogin mrvrancid \
+	nlogin nrancid nslogin nsrancid nxrancid prancid rivlogin \
+	rivrancid rrancid srancid tlogin tntlogin tntrancid trancid \
+	xrancid xrrancid zrancid
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -245,12 +246,13 @@ top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 bin_SCRIPTS = agmrancid alogin arancid arrancid avologin avorancid \
 	blogin brancid cat5rancid clogin control_rancid cssrancid \
-	elogin erancid f5rancid f10rancid flogin fnrancid francid \
-	hlogin hrancid htlogin htrancid jerancid jlogin jrancid \
-	mrancid mrvlogin mrvrancid nlogin nrancid nslogin nsrancid \
-	nxrancid par prancid rancid-fe rancid rivlogin rivrancid \
-	rrancid srancid tlogin tntlogin tntrancid trancid xrancid \
-	xrrancid zrancid lg.cgi lgform.cgi rancid-cvs rancid-run
+	elogin erancid f5rancid f10rancid flogin fnlogin fnrancid \
+	francid hlogin hrancid htlogin htrancid jerancid jlogin \
+	jrancid mrancid mrvlogin mrvrancid nlogin nrancid nslogin \
+	nsrancid nxrancid par prancid rancid-fe rancid rivlogin \
+	rivrancid rrancid srancid tlogin tntlogin tntrancid trancid \
+	xrancid xrrancid zrancid lg.cgi lgform.cgi rancid-cvs \
+	rancid-run
 EXTRA_DIST = lg.cgi.in lgform.cgi.in rancid-cvs.in rancid-run.in
 #dist_bin_SCRIPTS= $(bin_SCRIPTS:%=%.in)
 CLEANFILES = lg.cgi lgform.cgi rancid-cvs rancid-run
@@ -361,6 +363,8 @@ flogin: $(top_builddir)/config.status $(srcdir)/flogin.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 francid: $(top_builddir)/config.status $(srcdir)/francid.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+fnlogin: $(top_builddir)/config.status $(srcdir)/fnlogin.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 fnrancid: $(top_builddir)/config.status $(srcdir)/fnrancid.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 hlogin: $(top_builddir)/config.status $(srcdir)/hlogin.in

bin/alogin.in

@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: alogin.in 2161 2010-03-15 21:17:28Z root $
+## $Id: alogin.in 2268 2010-11-16 19:11:59Z heas $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (c) 1997-2009 by Terrapin Communications, Inc.
@@ -111,6 +111,12 @@ for {set i 0} {$i < $argc} {incr i} {
 		set username [ lindex $argv $i ]
 	    }
 	# VTY Password
+	} -p* {
+	    # ignore -p
+	# ssh passphrase
+	} -r* {
+	    # ignore -r
+	# VTY Password
 	} -v* {
 	    if {! [  regexp .\[vV\](.+) $arg ignore passwd]} {
 		incr i
@@ -385,6 +391,10 @@ proc login { router user userpswd passwd prompt cmethod cyphertype } {
 	    send_user "\nError: host key mismatch for $router.  Update the SSH known_hosts file accordingly.\n"
 	    return 1
 	}
+	-re "NOTICE:\[^\n\r]* - display now \[^\n\r]*:" { 
+	    send "no\r"
+	    exp_continue
+	}
 	-re "$u_prompt"			{
 					  send -- "$user\r"
 					  set uprompt_seen 1

bin/avologin.in

@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: avologin.in 2203 2010-06-17 18:14:51Z heas $
+## $Id: avologin.in 2254 2010-10-01 19:27:48Z heas $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (c) 1997-2009 by Terrapin Communications, Inc.
@@ -123,6 +123,9 @@ for {set i 0} {$i < $argc} {incr i} {
 		set userpasswd [lindex $argv $i]
 	    }
 	    set do_passwd 0
+	# ssh passphrase
+	} -r* {
+	    # ignore -r
 	# VTY Password
 	} -v* {
 	    if {! [regexp .\[vV\](.+) $arg ignore passwd]} {
@@ -606,7 +609,7 @@ foreach router [lrange $argv $i end] {
     }
 
     # look for noenable option in .cloginrc
-    if { [find noenable $router] != "" } {
+    if { [find noenable $router] == "1" } {
 	set enable 0
     }
 

bin/blogin.in

@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: blogin.in 2161 2010-03-15 21:17:28Z root $
+## $Id: blogin.in 2254 2010-10-01 19:27:48Z heas $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (c) 1997-2009 by Terrapin Communications, Inc.
@@ -122,6 +122,9 @@ for {set i 0} {$i < $argc} {incr i} {
 		set userpasswd [ lindex $argv $i ]
 	    }
 	    set do_passwd 0
+	# ssh passphrase
+	} -r* {
+	    # ignore -r
 	# VTY Password
 	} -v* {
 	    if {! [  regexp .\[vV\](.+) $arg ignore passwd]} {
@@ -538,7 +541,7 @@ foreach router [lrange $argv $i end] {
     }
 
     # look for noenable option in .cloginrc
-    if { [find noenable $router] != "" } {
+    if { [find noenable $router] == "1" } {
 	set enable 0
     }