diff --git a/rancid/CHANGES b/rancid/CHANGES index ff141bf1..dcfad447 100644 --- a/rancid/CHANGES +++ b/rancid/CHANGES @@ -1,4 +1,6 @@ 3.99.99 + clogin: new info in ASA login sequence matched as login prompt + nxos.pm: add show interface transceiver mrv.pm: add show inventory diff --git a/rancid/bin/clogin.in b/rancid/bin/clogin.in index 7ef07030..f777bed1 100644 --- a/rancid/bin/clogin.in +++ b/rancid/bin/clogin.in @@ -248,6 +248,12 @@ proc login { router user userpswd passwd enapasswd cmethod cyphertype identfile send_user "\nError: Check your passwd for $router\n" catch {close}; catch {wait}; return 1 } + -nocase -re "last login:" { + exp_continue + } + -nocase -re "failed login:" { + exp_continue + } "Login failed" { send_user "\nError: Check your passwd for $router\n" catch {close}; catch {wait}; return 1 @@ -267,9 +273,6 @@ proc login { router user userpswd passwd enapasswd cmethod cyphertype identfile send "K\r" exp_continue } - -re "Last login:" { - exp_continue - } -re "Press the key \[^\r\n]+\[\r\n]+" { exp_continue }