From afcac75e572bcdd3cf269b921b7e8324aa5ffd4c Mon Sep 17 00:00:00 2001 From: Tar Committer Date: Thu, 2 May 2002 23:08:06 +0000 Subject: Imported from rancid-2.2.1.tar.gz. --- bin/jlogin.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'bin/jlogin.in') diff --git a/bin/jlogin.in b/bin/jlogin.in index 2b10558..0f005d7 100755 --- a/bin/jlogin.in +++ b/bin/jlogin.in @@ -350,6 +350,10 @@ proc login { router user passwd cmethod cyphertype identfile} { send "no\r" send_user "\nError: The host key for $router has changed. Update the SSH known_hosts file accordingly.\n" return 1 } + -re "Offending key for .* \(yes\/no\)\?" { + send "no\r" + send_user "\nError: host key mismatch for $router. Update the SSH known_hosts file accordingly.\n" + return 1 } -re "(Username|\[\r\n]login):" { send "$user\r" exp_continue @@ -360,13 +364,7 @@ proc login { router user passwd cmethod cyphertype identfile} { } -re "$prompt" { break; } denied { send_user "\nError: Check your password for $router\n" - if { $do_command || $do_script } { - send "quit" - wait - return 1 - } else { - return 1 - } + catch {close}; wait; return 1 } } } -- cgit