Imported from rancid-2.3.2a8.tar.gz.HEADrancid-2.3.2a8master

3 files changed, 51 insertions, 16 deletions

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 624ed76..58c5891 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,24 +1,49 @@
 ## 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.14 2006/10/05 04:27:49 heas Exp $
+## $Id$
 ##
-## Copyright (C) 1997-2004 by Terrapin Communications, Inc.
+## Copyright (c) 1997-2007 by Terrapin Communications, Inc.
 ## All rights reserved.
 ##
-## This software may be freely copied, modified and redistributed
-## without fee for non-commerical purposes provided that this license
-## remains intact and unmodified with any RANCID distribution.
+## This code is derived from software contributed to and maintained by
+## Terrapin Communications, Inc. by Henry Kilmer, John Heasley, Andrew Partan,
+## Pete Whiting, Austin Schutz, and Andrew Fort.
 ##
-## There is no warranty or other guarantee of fitness of this software.
-## It is provided solely "as is".  The author(s) disclaim(s) all
-## responsibility and liability with respect to this software's usage
-## or its effect upon hardware, computer systems, other software, or
-## anything else.
-##
-## Except where noted otherwise, rancid was written by and is maintained by
-## Henry Kilmer, John Heasley, Andrew Partan, Pete Whiting, and Austin Schutz.
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions
+## are met:
+## 1. Redistributions of source code must retain the above copyright
+##    notice, this list of conditions and the following disclaimer.
+## 2. Redistributions in binary form must reproduce the above copyright
+##    notice, this list of conditions and the following disclaimer in the
+##    documentation and/or other materials provided with the distribution.
+## 3. All advertising materials mentioning features or use of this software
+##    must display the following acknowledgement:
+##        This product includes software developed by Terrapin Communications,
+##        Inc. and its contributors for RANCID.
+## 4. Neither the name of Terrapin Communications, Inc. nor the names of its
+##    contributors may be used to endorse or promote products derived from
+##    this software without specific prior written permission.
+## 5. It is requested that non-binding fixes and modifications be contributed
+##    back to Terrapin Communications, Inc.
 ##
+## THIS SOFTWARE IS PROVIDED BY Terrapin Communications, INC. AND CONTRIBUTORS
+## ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+## TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+## PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COMPANY OR CONTRIBUTORS
+## BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+## CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+## SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+## INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+## CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+## ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+## POSSIBILITY OF SUCH DAMAGE.
+# 
+#  The expect login scripts were based on Erik Sherk's gwtn, by permission.
+# 
+#  The original looking glass software was written by Ed Kern, provided by
+#  permission and modified beyond recognition.
 
 #AUTOMAKE_OPTIONS=foreign no-dependencies
 AUTOMAKE_OPTIONS=foreign
diff --git a/etc/Makefile.in b/etc/Makefile.in
index b79e72d..345707d 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -14,6 +14,12 @@
 
 @SET_MAKE@
 
+# 
+#  The expect login scripts were based on Erik Sherk's gwtn, by permission.
+# 
+#  The original looking glass software was written by Ed Kern, provided by
+#  permission and modified beyond recognition.
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -117,6 +123,7 @@ SORT = @SORT@
 SSH = @SSH@
 STRIP = @STRIP@
 SVN = @SVN@
+SVN_FSTYPE = @SVN_FSTYPE@
 TAR = @TAR@
 TELNET = @TELNET@
 TOUCH = @TOUCH@
diff --git a/etc/rancid.conf.sample.in b/etc/rancid.conf.sample.in
index 42d876a..d97e9c0 100644
--- a/etc/rancid.conf.sample.in
+++ b/etc/rancid.conf.sample.in
@@ -30,6 +30,9 @@ LOGDIR=$BASEDIR/logs; export LOGDIR
 # requires manual conversions.
 RCSSYS=@RCSSYS@; export RCSSYS
 #
+# if ACLSORT is NO, access-lists will NOT be sorted.
+#ACLSORT=YES; export ACLSORT
+#
 # if NOPIPE is set, temp files will be used instead of a cmd pipe during
 # collection from the router(s).
 #NOPIPE=YES; export NOPIPE
@@ -47,8 +50,8 @@ RCSSYS=@RCSSYS@; export RCSSYS
 #
 # 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.
-OLDTIME=4; export OLDTIME
+# of hours between your rancid-run cron job.  Default: 24
+#OLDTIME=4; export OLDTIME
 #
 # How many hours should pass before complaining that a group's collection
 # (the age of it's lock file) is hung.
@@ -69,7 +72,7 @@ OLDTIME=4; export OLDTIME
 # be sure to read ../README regarding aliases.
 #
 # If your MTA configuration is broken or you want mail to be forwarded to a
-# domain not the same the local one, define that domain here.  "@" must be
+# domain not the same as the local one, define that domain here.  "@" must be
 # 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