summaryrefslogtreecommitdiffstats
path: root/bin/arancid.in
diff options
context:
space:
mode:
authorTar Committer <tar@ocjtech.us>2001-08-03 03:13:25 +0000
committerTar Committer <tar@ocjtech.us>2001-08-03 03:13:25 +0000
commitaf496d2efa0969f29a22a4236c620f513eb90287 (patch)
treef3bc37d0d677b7ae1b58ae643fa25a91b80655aa /bin/arancid.in
parent0e84b727786a16ade28bb081742e5c39c33ed7fa (diff)
downloadrancid-af496d2efa0969f29a22a4236c620f513eb90287.tar.gz
rancid-af496d2efa0969f29a22a4236c620f513eb90287.tar.xz
rancid-af496d2efa0969f29a22a4236c620f513eb90287.zip
Imported from rancid-2.2b5.tar.gz.rancid-2.2b5
Diffstat (limited to 'bin/arancid.in')
-rwxr-xr-xbin/arancid.in15
1 files changed, 6 insertions, 9 deletions
diff --git a/bin/arancid.in b/bin/arancid.in
index 5003ddd..f27e2ec 100755
--- a/bin/arancid.in
+++ b/bin/arancid.in
@@ -5,7 +5,7 @@
## afort@choqolat.org (andrew fort)
##
##
-## Copyright (C) 1997 by Henry Kilmer.
+## Copyright (C) 1997-2001 by Henry Kilmer.
## All rights reserved.
##
## This software may be freely copied, modified and redistributed without
@@ -170,17 +170,14 @@ sub WriteTerm {
tr/\015//d;
last if(/^>>.*$prompt/);
chop;
- print $ENV{'NOCOMMSTR'};
- /(rcomm|wcomm|t1com|t2com)(\s+)(.*)/ &&
+ if (/(rcomm|wcomm|t1com|t2com)(\s+)(.*)/ &&
+ defined($ENV{'NOCOMMSTR'})) {
ProcessHistory("","","","\/\*\t$1$2\"<removed>\"\n") && next;
- #if (/^\s*snmp/ && defined($ENV{'NOCOMMSTR'})) {
- # /snmp (getcomm|setcomm|trapcomm)(\s+)(\S*)/ &&
- # ProcessHistory("","","","- snmp $1$2\"<removed>\"\n") && next;
- #}
+ }
next if (/^\/\* Configuration dump taken/i);
- next if (/^\/\* Version.*Base MAC.*/i);
+ next if (/^\/\* Version.*Base MAC.*/i);
- if (/^\/script end/) {
+ if (/^\/?script end/) {
$found_end = 1;
ProcessHistory("","","","$_\n");
return(1);