@@ -1,9 +1,9 @@
 #
 # Copyright (C) 1997-2000 Matt Newman <matt@novadigm.com> 
 #
-# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.7 2004/12/17 16:02:03 patthoyts Exp $
+# $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.tcl,v 1.8 2007/02/28 23:33:41 patthoyts Exp $
 #
 namespace eval tls {
     variable logcmd tclLog
     variable debug 0
  
@@ -32,10 +32,11 @@
 #
 # Helper function - behaves exactly as the native socket command.
 #
 proc tls::socket {args} {
     variable socketCmd
+    variable defaults
     set idx [lsearch $args -server]
     if {$idx != -1} {
 	set server 1
 	set callback [lindex $args [expr {$idx+1}]]
 	set args [lreplace $args $idx [expr {$idx+1}]]
@@ -48,11 +49,11 @@
 	set usage "wrong # args: should be \"tls::socket ?options? host port\""
 	set options "-async, -cadir, -cafile, -certfile, -cipher, -command, -keyfile, -myaddr, -myport, -password, -request, -require, -ssl2, -ssl3, or -tls1"
     }
     set argc [llength $args]
     set sopts {}
-    set iopts [concat [list -server $server] ${tls::defaults}]	;# Import options
+    set iopts [concat [list -server $server] $defaults]	;# Import options
 
     for {set idx 0} {$idx < $argc} {incr idx} {
 	set arg [lindex $args $idx]
 	switch -glob -- $server,$arg {
 	    0,-async	{lappend sopts $arg}