From ac54243f382e817c08c1f895ccfdc05dcacdb044 Mon Sep 17 00:00:00 2001
From: Tar Committer <tar@ocjtech.us>
Date: Sun, 14 Jan 2007 05:39:54 +0000
Subject: Imported from rancid-2.3.2a7.tar.gz.

---
 bin/flogin.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'bin/flogin.in')

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
 	    }
 	}
-- 
cgit