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

3 files changed, 26 insertions, 8 deletions

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 1a37d6e..de060b1 100644
--- a/etc/Makefile.in
+++ b/etc/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.
@@ -46,6 +46,12 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
 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|^.*/||'`;
 am__installdirs = "$(DESTDIR)$(pkgdatadir)"
 pkgdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pkgdata_DATA)
@@ -129,6 +135,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@
@@ -213,7 +221,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
 	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
 	@list='$(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 " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
 	  $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
@@ -221,7 +229,7 @@ install-pkgdataDATA: $(pkgdata_DATA)
 uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(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
@@ -286,7 +294,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/etc/lg.conf.sample.in b/etc/lg.conf.sample.in
index 54e538a..73ff892 100644
--- a/etc/lg.conf.sample.in
+++ b/etc/lg.conf.sample.in
@@ -1,7 +1,7 @@
 # configuration file for the looking glass
 #
 # note: these are perl statements!  Mind the syntax.  "perl -c lg.conf"
-#       should succeed.
+#	should succeed.
 #
 # adjust the path to find [cfj]login, telnet, ssh, rsh, etc.
 #
@@ -126,8 +126,8 @@ $queries = {};
 #
 # Interface queries
 $queries->{"interface"} = {
-        framerelay => "show frame-relay PVC [DLCI]",
-        interface => "show interface [interface]"
+	framerelay => "show frame-relay PVC [DLCI]",
+	interface => "show interface [interface]"
 };
 #
 # Routing queries
diff --git a/etc/rancid.conf.sample.in b/etc/rancid.conf.sample.in
index 8cc1b09..2a51249 100644
--- a/etc/rancid.conf.sample.in
+++ b/etc/rancid.conf.sample.in
@@ -37,6 +37,10 @@ LOGDIR=$BASEDIR/logs; export LOGDIR
 # if NOCOMMSTR is set, snmp community strings will be stripped from the configs
 #NOCOMMSTR=YES; export NOCOMMSTR
 #
+# How many times failed collections are retried (for each run) before
+# giving up.  Minimum: 1
+#MAX_ROUNDS=4; export MAX_ROUNDS
+#
 # How many hours should pass before complaining about routers that
 # can not be reached.  The value should be greater than the number
 # of hours between your rancid-run cron job.
@@ -65,3 +69,9 @@ OLDTIME=4; export OLDTIME
 # included, as this is simply appended to the usual recipients.  It is NOT
 # appended to recipients specified in rancid-run's -m option.
 #MAILDOMAIN="@example.com"; export MAILDOMAIN
+#
+# By default, rancid mail is marked with precedence "bulk".  This may be
+# changed by setting the MAILHEADERS variable; for example no header by setting
+# it to "" or adding X- style headers.  Individual headers must be separated
+# by a \n.
+#MAILHEADERS="Precedence: bulk"; export MAILHEADERS