summaryrefslogtreecommitdiffstats
path: root/bin/flogin.in
diff options
context:
space:
mode:
authorTar Committer <tar@ocjtech.us>2007-01-14 05:39:54 +0000
committerTar Committer <tar@ocjtech.us>2007-01-14 05:39:54 +0000
commitac54243f382e817c08c1f895ccfdc05dcacdb044 (patch)
tree1c9b224e2714d9a6fd0ba8a7b211e287d3f8c9b9 /bin/flogin.in
parent1a7c45398738cdb4eaafdc9e0962272f19d54816 (diff)
downloadrancid-ac54243f382e817c08c1f895ccfdc05dcacdb044.zip
rancid-ac54243f382e817c08c1f895ccfdc05dcacdb044.tar.gz
rancid-ac54243f382e817c08c1f895ccfdc05dcacdb044.tar.xz
Imported from rancid-2.3.2a7.tar.gz.rancid-2.3.2a7
Diffstat (limited to 'bin/flogin.in')
-rw-r--r--bin/flogin.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/bin/flogin.in b/bin/flogin.in
index 4e93e35..5c8813d 100644
--- a/bin/flogin.in
+++ b/bin/flogin.in
@@ -1,6 +1,6 @@
#! @EXPECT_PATH@ --
##
-## $Id: flogin.in,v 1.44 2006/12/05 16:50:52 heas Exp $
+## $Id: flogin.in,v 1.47 2006/12/08 21:28:26 heas Exp $
##
## @PACKAGE@ @VERSION@
## Copyright (C) 1997-2006 by Terrapin Communications, Inc.
@@ -564,6 +564,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
@@ -637,7 +640,7 @@ foreach router [lrange $argv $i end] {
if { $enable } {
if {[do_enable $enauser $enapasswd]} {
if { $do_command || $do_script } {
- close; wait
+ catch {close}; catch {wait}
continue
}
}