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

6 files changed, 78 insertions, 64 deletions

diff --git a/share/Makefile.in b/share/Makefile.in
index 3f10f76..13e51db 100644
--- a/share/Makefile.in
+++ b/share/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.8.4 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -47,12 +47,19 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES = rtrfilter
-am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)"
+am__installdirs = "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadir)" \
+	"$(DESTDIR)$(pkgdatadir)"
 dist_pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 pkgdataSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(dist_pkgdata_SCRIPTS) $(pkgdata_SCRIPTS)
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 dist_pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_pkgdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -135,6 +142,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build_alias = @build_alias@
 datadir = @datadir@
@@ -256,7 +265,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " $(dist_pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
 	  $(dist_pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
@@ -264,7 +273,7 @@ install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
 uninstall-dist_pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_pkgdata_DATA)'; for p in $$list; do \
-	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  f=$(am__strip_dir) \
 	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
@@ -329,7 +338,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
diff --git a/share/cisco-load.exp b/share/cisco-load.exp
index 0c28549..995659f 100644
--- a/share/cisco-load.exp
+++ b/share/cisco-load.exp
@@ -1,5 +1,5 @@
 ##
-## $Id: cisco-load.exp,v 1.10 2004/01/11 03:43:50 heas Exp $
+## $Id: cisco-load.exp,v 1.11 2005/06/14 23:06:26 heas Exp $
 ##
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
@@ -46,8 +46,8 @@
 #	prompt		cmd-line prompt as determined by clogin
 #
 # note: the tcl/expect parser is extremely stoopid.  comment lines are NOT
-#       completely ignored!!  so, a '{' or '}' in a comment might produce
-#       unexpected results.
+#	completely ignored!!  so, a '{' or '}' in a comment might produce
+#	unexpected results.
 ##
 # log_user 1
 # exp_internal 1
@@ -72,11 +72,12 @@ proc logout { ecode } {
 
     send "quit\r"
     expect {
-	"$prompt"       { logout $ecode }
+	"$prompt"	{ logout $ecode }
 	timeout { send_error "Error: timeout waiting for EOF after quit\n"}
-	eof     {
-		send_user "\n"
-		exit $ecode }
+	eof		{
+			  send_user "\n"
+			  exit $ecode
+			}
     }
 }
 
@@ -91,13 +92,15 @@ proc erase { } {
     send "write erase\r"
     expect {
 	-re " Continue\[^\n\]\*confirm\]" {
-		send	"\r"
-		exp_continue }
-	"$prompt"       { }
-	timeout {
-		send_error "Error: timeout waiting for write erase.\n"
-		logout 1 }
-	eof     { logout 1 }
+			  send "\r"
+			  exp_continue
+			}
+	"$prompt"	{ }
+	timeout		{
+			  send_error "Error: timeout waiting for write erase.\n"
+			  logout 1
+			}
+	eof		{ logout 1 }
     }
 }
 
@@ -165,10 +168,10 @@ proc doload { confghost routername config retry } {
 		send_error "Error: timeout exceeded while loading config\n"
 		logout 1 }
 	-re "\[^\n\]*Connection refused" {
-		send_error "Error: $expect_out(0,string)\n" 
+		send_error "Error: $expect_out(0,string)\n"
 		logout 1 }
 	-re "\[^\n\]*Destination unreachable" {
-		send_error "Error: $expect_out(0,string)\n" 
+		send_error "Error: $expect_out(0,string)\n"
 		logout 1 }
 	-re "\[^\n\]*Permission denied" {
 		send_error "Error: $expect_out(0,string)\n"
@@ -203,9 +206,10 @@ proc doload { confghost routername config retry } {
 	-re "\[^\n]*Error (opening|copying).*\r" {
 		send_error "Error: $expect_out(0,string)\n"
 		logout 1 }
-        -nocase -re "\[^\n]* error\[^a-z\n]+\[^\n]*" {
-                send_error "$expect_out(0,string)\n"
-                logout 1 }
+	-nocase -re "\[^\n]* error\[^a-z\n]+\[^\n]*" {
+			  send_error "$expect_out(0,string)\n"
+			  logout 1
+			}
 	"\n"		{ exp_continue }
 	-re "^\[^ ]*\#"	{
 		send_user "load successful.\n"
@@ -245,25 +249,25 @@ logout 0
 # these were my original transcripts of performing loads.  it is a useful
 # example of info you may collect to get an idea of what needs to be handled
 # in the expect{}s
-#  
+#
 #  pdx-oob#
 #  pdx-oob#copy rcp start
 #  Address of remote host [255.255.255.255]? 205.238.52.35
 #  Name of configuration file [a]? pdx-oob-confg
 #  Configure using pdx-oob-confg from 205.238.52.35? [confirm]
-#  
+#
 #  Connected to 205.238.52.35
 #  Loading 8131 byte file pdx-oob-confg: !!!! [OK]
 #  Compressing configuration from 8131 bytes to 3886 bytes
 #  [OK]
 #  pdx-oob#
-#  
+#
 
 #  12.0S-isms
 #  pao2#cop rcp sta
 #  Address or name of remote host []? eng0
 #  Translating "eng0"...domain server (205.238.52.46) [OK]
-#  
+#
 #  Source username [pao2]? 
 #  Source filename []? pao2-confg
 #  Destination filename [startup-config]? 
@@ -274,7 +278,7 @@ logout 0
 #  Accessing rcp://pao2@eng0/pao2-confg...
 #  Connected to 205.238.52.35
 #  Loading 30138 byte file pao2-confg: !!!!!! [OK]
-#  
+#
 #  30138 bytes copied in 2.576 secs (15069 bytes/sec)
 #  pao2#
 # OR IS IT
@@ -292,7 +296,7 @@ logout 0
 #  Address of remote host [255.255.255.255]? 205.238.52.35
 #  Name of configuration file [a]? pdx-oob-confg
 #  Configure using pdx-oob-confg from 205.238.52.35? [confirm]
-#  
+#
 #  Connected to 205.238.52.35
 #  Loading 8131 byte file pdx-oob-confg: !!!! [OK]
 #  Compressing configuration from 8131 bytes to 3886 bytes
@@ -301,17 +305,17 @@ logout 0
 #  Address of remote host [205.238.52.35]? 205.238.52.35
 #  Name of configuration file [pdx-oob-confg]? pdx-oob-confg
 #  Configure using pdx-oob-confg from 205.238.52.35? [confirm]
-#  
+#
 #  Connected to 205.238.52.35
 #  %rcp: /tftpboot/pdx-oob-confg: No such file or directory
 #  pdx-oob#
-#  
+#
 
 #  pdx-oob#copy rcp start
 #  Address of remote host [205.238.52.35]? 205.238.52.35 
 #  Name of configuration file [pdx-oob-confg]? pdx-oob-confg 
 #  Configure using pdx-oob-confg from 205.238.52.35? [confirm]
-#  
+#
 #  Connected to 205.238.52.35
 #  %rcp: /tftpboot/pdx-oob-confg: Permission denied
 #  pdx-oob#
@@ -323,9 +327,9 @@ logout 0
 #  Name of configuration file [pdx-oob-confg]? 
 #  Configure using pdx-oob-confg from 205.238.1.94? [confirm]
 #  % Destination unreachable; gateway or host down
-#  
+#
 #  pdx-oob#
-#  
+#
 
 #  *** response from host w/o rcp daemon
 #  pdx-oob#cop rcp sta 
@@ -333,6 +337,6 @@ logout 0
 #  Name of configuration file [pdx-oob-confg]? 
 #  Configure using pdx-oob-confg from 205.238.1.66? [confirm]
 #  % Connection refused by remote host
-#  
+#
 #  pdx-oob#
-#  
+#
diff --git a/share/cisco-reload.exp b/share/cisco-reload.exp
index 25880c1..22c08a9 100644
--- a/share/cisco-reload.exp
+++ b/share/cisco-reload.exp
@@ -1,5 +1,5 @@
 ##
-## $Id: cisco-reload.exp,v 1.9 2004/01/11 03:43:50 heas Exp $
+## $Id: cisco-reload.exp,v 1.10 2005/06/14 23:06:27 heas Exp $
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -29,14 +29,14 @@
 # e.g. usage:
 # % clogin -s cisco-reload.exp -Ereload_arg='at 01:00' router
 # router
-#        Reload scheduled for 01:00:00 UTC Sat Jun 23 2001 (in 7 hours and 16 minutes)
+#	Reload scheduled for 01:00:00 UTC Sat Jun 23 2001 (in 7 hours and 16 minutes)
 # % clogin -s cisco-reload.exp -Ereload_arg='at cancel' router
 # router
-#        % Ambiguous command:  "reload at cancel"
+#	% Ambiguous command:  "reload at cancel"
 #
 # % clogin -s cisco-reload.exp -Ereload_arg='cancel' router
 # router
-#        SHUTDOWN ABORTED
+#	SHUTDOWN ABORTED
 #
 #
 # keep in mind that it is important to NOT polute the global variable space.
@@ -49,8 +49,8 @@
 #	prompt		cmd-line prompt as determined by clogin
 #
 # note: the tcl/expect parser is extremely stoopid.  comment lines are NOT
-#       completely ignored!!  so, a '{' or '}' in a comment might produce
-#       unexpected results.
+#	completely ignored!!  so, a '{' or '}' in a comment might produce
+#	unexpected results.
 ##
 # exp_internal 1
 # log_user 1
@@ -68,7 +68,7 @@ if ([info exists Ereload_arg]) {
 
 send "\r"
 expect {
-     timeout 			{ send_error "Error: did not receive prompt\n"
+    timeout 			{ send_error "Error: did not receive prompt\n"
 				  exit }
     -re "^.*$prompt"		{ send "$reloadcmd\r"
 				  expect * {} }
@@ -133,15 +133,15 @@ expect {
 ## Proceed with reload? [confirm]
 ## ultra#reload can
 ## ultra#
-## 
-## 
+##
+##
 ## ***
 ## *** --- SHUTDOWN ABORTED ---
 ## ***
 ## ultra# reload at 8:10 10 dec
-## 
+##
 ## System configuration has been modified. Save? [yes/no]: no
 ## Reload scheduled for 08:10:00 PST Thu Dec 10 1998 (in 296 hours and 17 minutes)
 ## Proceed with reload? [confirm]
 ## ultra#
-## 
+##
diff --git a/share/downreport.in b/share/downreport.in
index a05a524..f2fd4c3 100644
--- a/share/downreport.in
+++ b/share/downreport.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 ##
-## $Id: downreport.in,v 1.9 2004/01/11 03:43:50 heas Exp $
+## $Id: downreport.in,v 1.11 2005/07/07 01:09:14 heas Exp $
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -40,19 +40,23 @@ elif [ "$LIST_OF_GROUPS" = "" ] ; then
     exit 1
 fi
 
+# mail variables
+set | grep MAILHEADERS= > /dev/null 2>&1
+if [ $? -ne 0 ] ; then
+    MAILHEADERS="Precedence: bulk\n"; export MAILHEADERS
+fi
 
 for GROUP in $LIST_OF_GROUPS; do
   (
     echo "To: @MAILPLUS@admin-$GROUP"
     echo "Subject: Down router report - $GROUP"
-    echo "Precedence: bulk"
+    echo "$MAILHEADERS" | awk '{gsub(/\\n/,"\n");print;}'
     echo ""
     DIR=$BASEDIR/$GROUP
     if [ -s $DIR/routers.down ]; then
       (
-  
-      cat  << EOM
-  
+	cat  << EOM
+
 	The following $GROUP routers are listed as other than up.
 
 	Routers listed as "up" in rancid's router.db are polled several
@@ -61,20 +65,17 @@ not polled.
 
 EOM
 
-      cat $DIR/routers.down;
-
+	cat $DIR/routers.down;
       )
-
     else
       (
+	cat  << EOM
 
-      cat  << EOM
-
-        No routers are down/ticketed for router group $GROUP (yay).
+	No routers are down/ticketed for router group $GROUP (yay).
 
 EOM
 
-      ) 
+      )
     fi
   ) | sendmail -t
 
diff --git a/share/lgnotes.html b/share/lgnotes.html
index 3f12357..502a51d 100644
--- a/share/lgnotes.html
+++ b/share/lgnotes.html
@@ -30,7 +30,7 @@ Ed Kern's looking glass (which was http://nitrous.digex.net).
 <li>The looking glass will ping a router prior to querying it to avoid
     trying to query routers which are down or otherwise inaccessible.</li>
 <li>Login failures can be intermittent or permanent, either due to the
-    router being inaccessible from the looking glass machine, 
+    router being inaccessible from the looking glass machine,
     or authorization failure(s).  Contact your local network engineering
     folks to resolve login failures.</li>
 <li>Queries followed by &lt;something&gt; require an argument(s) in the text
diff --git a/share/rtrfilter.in b/share/rtrfilter.in
index 9807e1f..f2caaca 100644
--- a/share/rtrfilter.in
+++ b/share/rtrfilter.in
@@ -1,6 +1,6 @@
 #! @PERLV_PATH@
 ##
-## $Id: rtrfilter.in,v 1.13 2004/01/11 03:43:50 heas Exp $
+## $Id: rtrfilter.in,v 1.14 2005/06/14 23:06:27 heas Exp $
 ##
 ## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
 ## All rights reserved.
@@ -43,7 +43,7 @@
 #
 # exclusion takes precedence and defaults to nothing.  inclusion defaults to
 # everything.
-#	
+#
 # this program requires the Mail::Mailer module which can be found on CPAN.
 ##
 BEGIN {