--- /old/rancid/bin/f5rancid 2011-02-19 10:43:30.163436700 -0500
+++ f5rancid 2011-07-14 19:14:02.000000000 -0400
@@ -326,14 +326,15 @@
sub ShowSslKey {
print STDERR " In ShowSslKey: $_" if ($debug);
while () {
+ s/ \015//; -LR-
tr/\015//d;
# v9 software license does not have CR at EOF
s/^#-+($prompt.*)/$1/;
last if (/^$prompt/);
next if (/^(\s*|\s*$cmd\s*)$/);
- return(1) if /^\s*\^\s*$/;
+ ## LR return(1) if /^\s*\^\s*$/;
return(1) if /(Invalid input detected|Type help or )/;
return(-1) if (/command authorization failed/i);
ProcessHistory("SSLKEY","","","# $_") && next;
@@ -345,14 +346,15 @@
sub ShowSslCrt {
print STDERR " In ShowSslCrt: $_" if ($debug);
while () {
+ s/ \015//; # -LR- [space][cr]
tr/\015//d;
# v9 software license does not have CR at EOF
s/^#-+($prompt.*)/$1/;
last if (/^$prompt/);
next if (/^(\s*|\s*$cmd\s*)$/);
- return(1) if /^\s*\^\s*$/;
+ ## LR return(1) if /^\s*\^\s*$/;
return(1) if /(Invalid input detected|Type help or )/;
return(-1) if (/command authorization failed/i);
ProcessHistory("SSLCRT","","","# $_") && next;
@@ -364,8 +366,9 @@
sub ShowRouteStatic {
print STDERR " In ShowRouteStatic: $_" if ($debug);
while () {
+ s/ \015//; # -LR- [space][cr]
tr/\015//d;
last if (/^$prompt/);
next if (/^(\s*|\s*$cmd\s*)$/);
return(1) if /^\s*\^\s*$/;
@@ -590,8 +605,9 @@
ProcessHistory("COMMENTS","keysort","A1","#\n");
ProcessHistory("COMMENTS","keysort","B0","#\n");
ProcessHistory("COMMENTS","keysort","C0","#\n");
TOP: while() {
+ s/ \015//; # -LR- [space][cr]
tr/\015//d;
if (/^Error:/) {
print STDOUT ("$host clogin error: $_");
print STDERR ("$host clogin error: $_") if ($debug);