Imported from rancid-2.3.2a7.tar.gz.

dotwaffle · Jan 14, 2007 · ac54243 · ac54243
1 parent 1a7c453
commit ac54243
Show file tree

Hide file tree

Showing 23 changed files with 785 additions and 710 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,9 @@
-2.3.2a6
+2.3.2
+	srancid: SMC/Dell switch support - loaner from Randy Bush
+
+	*login: Set variables for do_login when both -e and -p/-v are specified
+		- reported by A Dudek
+
 	*login: recognize the environment variable CLOGINRC, see clogin(1)
 
 	agmrancid: Cisco AGM/Anomaly Guard Module

diff --git a/aclocal.m4 b/aclocal.m4
@@ -11,8 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.60],,
-[m4_fatal([this file was generated for autoconf 2.60.
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
 You have another version of autoconf.  If you want to use that,
 you should regenerate the build system entirely.], [63])])
 

diff --git a/bin/Makefile.am b/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,v 1.35 2006/11/23 20:26:47 heas Exp $
+## $Id: Makefile.am,v 1.36 2007/01/13 22:01:53 heas Exp $
 ##
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -30,7 +30,7 @@ bin_SCRIPTS = cat5rancid control_rancid \
 	hlogin hrancid htlogin htrancid \
 	jerancid jlogin jrancid \
 	mrancid nlogin nrancid nslogin nsrancid par prancid \
-	rancid rancid-fe rivlogin rivrancid rrancid \
+	rancid rancid-fe rivlogin rivrancid rrancid srancid \
 	tntlogin tntrancid xrancid zrancid
 
 bin_SCRIPTS += lg.cgi lgform.cgi rancid-cvs rancid-run

diff --git a/bin/Makefile.in b/bin/Makefile.in
@@ -48,9 +48,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/nsrancid.in $(srcdir)/par.in $(srcdir)/prancid.in \
 	$(srcdir)/rancid-fe.in $(srcdir)/rancid.in \
 	$(srcdir)/rivlogin.in $(srcdir)/rivrancid.in \
-	$(srcdir)/rrancid.in $(srcdir)/tntlogin.in \
-	$(srcdir)/tntrancid.in $(srcdir)/xrancid.in \
-	$(srcdir)/zrancid.in
+	$(srcdir)/rrancid.in $(srcdir)/srancid.in \
+	$(srcdir)/tntlogin.in $(srcdir)/tntrancid.in \
+	$(srcdir)/xrancid.in $(srcdir)/zrancid.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.in
@@ -63,7 +63,7 @@ CONFIG_CLEAN_FILES = control_rancid par rancid-fe agmrancid alogin \
 	elogin erancid f10rancid flogin francid fnrancid jlogin \
 	jrancid jerancid hlogin hrancid htlogin htrancid mrancid \
 	nlogin nrancid nslogin nsrancid prancid rivlogin rivrancid \
-	rrancid tntlogin tntrancid xrancid zrancid
+	rrancid srancid tntlogin tntrancid xrancid zrancid
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -209,8 +209,8 @@ bin_SCRIPTS = cat5rancid control_rancid agmrancid alogin arancid \
 	flogin francid fnrancid hlogin hrancid htlogin htrancid \
 	jerancid jlogin jrancid mrancid nlogin nrancid nslogin \
 	nsrancid par prancid rancid rancid-fe rivlogin rivrancid \
-	rrancid tntlogin tntrancid xrancid zrancid lg.cgi lgform.cgi \
-	rancid-cvs rancid-run
+	rrancid srancid tntlogin tntrancid xrancid 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
@@ -345,6 +345,8 @@ rivrancid: $(top_builddir)/config.status $(srcdir)/rivrancid.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 rrancid: $(top_builddir)/config.status $(srcdir)/rrancid.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+srancid: $(top_builddir)/config.status $(srcdir)/srancid.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 tntlogin: $(top_builddir)/config.status $(srcdir)/tntlogin.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 tntrancid: $(top_builddir)/config.status $(srcdir)/tntrancid.in

diff --git a/bin/agmrancid.in b/bin/agmrancid.in
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: agmrancid.in,v 1.1 2006/11/23 20:20:16 heas Exp $
+## $Id: agmrancid.in,v 1.2 2006/12/06 00:40:54 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -43,6 +43,9 @@ $found_env = 0;
 $found_diag = 0;
 $timeo = 90;				# clogin timeout in seconds
 
+# the AGM kicks us off if it does not know our terminal type
+$ENV{'TERM'} = "dumb";
+
 my(@commandtable, %commands, @commands);# command lists
 my(%filter_pwds);			# password filtering mode
 

diff --git a/bin/blogin.in b/bin/blogin.in
@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: blogin.in,v 1.33 2006/12/05 16:50:52 heas Exp $
+## $Id: blogin.in,v 1.36 2006/12/08 21:28:25 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -532,6 +532,9 @@ foreach router [lrange $argv $i end] {
       }
       set passwd [join [lindex $pswd 0] ""]
       set enapasswd [join [lindex $pswd 1] ""]
+    } else {
+	set passwd $userpasswd
+	set enapasswd $enapasswd
     }
 
     # Figure out username
@@ -605,7 +608,7 @@ foreach router [lrange $argv $i end] {
     if { $enable } {
 	if {[do_enable $enauser $enapasswd]} {
 	    if { $do_command || $do_script } {
-		close; wait
+		catch {close}; catch {wait}
 		continue
 	    }
 	}

diff --git a/bin/clogin.in b/bin/clogin.in
@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: clogin.in,v 1.103 2006/12/05 16:50:52 heas Exp $
+## $Id: clogin.in,v 1.107 2006/12/08 21:28:25 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -754,6 +754,9 @@ foreach router [lrange $argv $i end] {
       }
       set passwd [join [lindex $pswd 0] ""]
       set enapasswd [join [lindex $pswd 1] ""]
+    } else {
+	set passwd $userpasswd
+	set enapasswd $enapasswd
     }
 
     # Figure out username
@@ -822,13 +825,13 @@ foreach router [lrange $argv $i end] {
 
     # Login to the router
     if {[login $router $ruser $userpswd $passwd $enapasswd $cmethod $cyphertype]} {
-	# if login failed or rsh was successful, move on to the next device
+	# if login failed or rsh was unsuccessful, move on to the next device
 	continue
     }
     if { $enable } {
 	if {[do_enable $enauser $enapasswd]} {
 	    if { $do_command || $do_script } {
-		close; wait
+		catch {close}; catch {wait}
 		continue
 	    }
 	}

diff --git a/bin/control_rancid.in b/bin/control_rancid.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 ##
-## $Id: control_rancid.in,v 1.79 2006/10/05 04:27:42 heas Exp $
+## $Id: control_rancid.in,v 1.80 2006/12/07 21:14:06 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -87,6 +87,9 @@ DIR=$BASEDIR/$GROUP
 TMP=${TMPDIR:=/tmp}/rancid.$GROUP.$$
 trap 'rm -fr $TMP;' 1 2 15
 
+# disable noclobber
+unset noclobber > /dev/null 2>&1
+
 # RCS system
 RCSSYS=${RCSSYS:=cvs};
 if [ $RCSSYS != "cvs" -a $RCSSYS != "svn" ] ; then

diff --git a/bin/flogin.in b/bin/flogin.in
@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: flogin.in,v 1.44 2006/12/05 16:50:52 heas Exp $
+## $Id: flogin.in,v 1.47 2006/12/08 21:28:26 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -564,6 +564,9 @@ foreach router [lrange $argv $i end] {
       }
      set passwd [join [lindex $pswd 0] ""]
      set enapasswd [join [lindex $pswd 1] ""]
+    } else {
+	set passwd $userpasswd
+	set enapasswd $enapasswd
     }
 
     # Figure out username
@@ -637,7 +640,7 @@ foreach router [lrange $argv $i end] {
     if { $enable } {
 	if {[do_enable $enauser $enapasswd]} {
 	    if { $do_command || $do_script } {
-		close; wait
+		catch {close}; catch {wait}
 		continue
 	    }
 	}

diff --git a/bin/hlogin.in b/bin/hlogin.in
@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: hlogin.in,v 1.37 2006/12/05 16:50:52 heas Exp $
+## $Id: hlogin.in,v 1.40 2006/12/08 21:28:26 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -623,6 +623,9 @@ foreach router [lrange $argv $i end] {
       }
       set passwd [join [lindex $pswd 0] ""]
       set enapasswd [join [lindex $pswd 1] ""]
+    } else {
+	set passwd $userpasswd
+	set enapasswd $enapasswd
     }
 
     # Figure out username
@@ -702,7 +705,7 @@ foreach router [lrange $argv $i end] {
     if { $enable } {
 	if {[do_enable $enauser $enapasswd]} {
 	    if { $do_command || $do_script } {
-		close; wait
+		catch {close}; catch {wait}
 		continue
 	    }
 	}

diff --git a/bin/jrancid.in b/bin/jrancid.in
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: jrancid.in,v 1.79 2006/10/05 04:27:43 heas Exp $
+## $Id: jrancid.in,v 1.80 2006/12/05 17:14:27 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -183,7 +183,7 @@ sub ShowChassisClocks {
 	}
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show chassis environment"
@@ -216,7 +216,7 @@ sub ShowChassisEnvironment {
 		ProcessHistory("","","","# $1\n") && next;
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show chassis firmware"
@@ -240,7 +240,7 @@ sub ShowChassisFirmware {
 
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show chassis fpc detail"
@@ -267,7 +267,7 @@ sub ShowChassisFpcDetail {
 	/ Uptime/ && next;
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show chassis hardware"
@@ -291,7 +291,7 @@ sub ShowChassisHardware {
 
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show chassis routing-engine"
@@ -323,7 +323,7 @@ sub ShowChassisRoutingEngine {
 	/ Serial ID/ && ProcessHistory("","","","# $_") && next;
 	/^\s*$/ && ProcessHistory("","","","# $_") && next;
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show chassis cfeb", "show chassis feb", "show
@@ -358,7 +358,7 @@ sub ShowChassisSCB {
 	ProcessHistory("","","","# $_");
     }
     $ShowChassisSCB = 1;
-    return;
+    return(0);
 }
 
 # This routine parses "show chassis alarms"
@@ -380,7 +380,7 @@ sub ShowChassisAlarms {
 
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show system autoinstallation status"
@@ -402,7 +402,7 @@ sub ShowSystemAutoinstall {
 
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 sub ShowSystemCoreDumps {
@@ -444,7 +444,7 @@ sub ShowSystemLicense {
 
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show system license keys"
@@ -466,7 +466,7 @@ sub ShowSystemLicenseKeys {
 
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show system boot-messages"
@@ -493,7 +493,7 @@ sub ShowSystemBootMessages {
 	/^\/dev\// && next;
 	ProcessHistory("","","","# $_");
     }
-    return;
+    return(0);
 }
 
 # This routine parses "show version"
@@ -514,7 +514,7 @@ sub ShowVersion {
     }
     ProcessHistory("","","","#\n");
 
-    return;
+    return(0);
 }
 
 # This routine parses "show configuration"
@@ -588,7 +588,7 @@ sub ShowConfiguration {
 	return(-1);
     }
 
-    return;
+    return(0);
 }
 
 ###

diff --git a/bin/nlogin.in b/bin/nlogin.in
@@ -1,6 +1,6 @@
 #! @EXPECT_PATH@ --
 ##
-## $Id: nlogin.in,v 1.32 2006/12/05 16:50:52 heas Exp $
+## $Id: nlogin.in,v 1.33 2006/12/08 21:28:26 heas Exp $
 ##
 ## @PACKAGE@ @VERSION@
 ## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -453,6 +453,9 @@ foreach firewall [lrange $argv $i end] {
       }
      set passwd [join [lindex $pswd 0] ""]
      set enapasswd [join [lindex $pswd 1]  ""]
+    } else {
+	set passwd $userpasswd
+	set enapasswd $enapasswd
     }
 
     # Figure out username