diff options
| author | Tar Committer <tar@ocjtech.us> | 2007-01-14 05:39:54 +0000 |
|---|---|---|
| committer | Tar Committer <tar@ocjtech.us> | 2007-01-14 05:39:54 +0000 |
| commit | ac54243f382e817c08c1f895ccfdc05dcacdb044 (patch) | |
| tree | 1c9b224e2714d9a6fd0ba8a7b211e287d3f8c9b9 /bin/clogin.in | |
| parent | 1a7c45398738cdb4eaafdc9e0962272f19d54816 (diff) | |
| download | rancid-ac54243f382e817c08c1f895ccfdc05dcacdb044.tar.gz rancid-ac54243f382e817c08c1f895ccfdc05dcacdb044.tar.xz rancid-ac54243f382e817c08c1f895ccfdc05dcacdb044.zip | |
Imported from rancid-2.3.2a7.tar.gz.rancid-2.3.2a7
Diffstat (limited to 'bin/clogin.in')
| -rw-r--r-- | bin/clogin.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bin/clogin.in b/bin/clogin.in index 81c654e..99a0874 100644 --- a/bin/clogin.in +++ b/bin/clogin.in @@ -1,6 +1,6 @@ #! @EXPECT_PATH@ -- ## -## $Id: clogin.in,v 1.103 2006/12/05 16:50:52 heas Exp $ +## $Id: clogin.in,v 1.107 2006/12/08 21:28:25 heas Exp $ ## ## @PACKAGE@ @VERSION@ ## Copyright (C) 1997-2006 by Terrapin Communications, Inc. @@ -754,6 +754,9 @@ foreach router [lrange $argv $i end] { } set passwd [join [lindex $pswd 0] ""] set enapasswd [join [lindex $pswd 1] ""] + } else { + set passwd $userpasswd + set enapasswd $enapasswd } # Figure out username @@ -822,13 +825,13 @@ foreach router [lrange $argv $i end] { # Login to the router if {[login $router $ruser $userpswd $passwd $enapasswd $cmethod $cyphertype]} { - # if login failed or rsh was successful, move on to the next device + # if login failed or rsh was unsuccessful, move on to the next device continue } if { $enable } { if {[do_enable $enauser $enapasswd]} { if { $do_command || $do_script } { - close; wait + catch {close}; catch {wait} continue } } |