[Tkabber-dev] [tclxmpp commit] r70 - in trunk: . xmpp

codesite-noreply at google.com codesite-noreply at google.com
Tue Feb 10 22:09:25 MSK 2009


Author: sgolovan
Date: Tue Feb 10 10:31:07 2009
New Revision: 70

Modified:
    trunk/ChangeLog
    trunk/xmpp/tls.tcl

Log:
	* xmpp/tls.tcl: Changed -password option to -passwordcommand to avoid
	  clash with password for proxy.


Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Tue Feb 10 10:31:07 2009
@@ -1,3 +1,8 @@
+2009-02-10  Sergei Golovan  <sgolovan at nes.ru>
+
+	* xmpp/tls.tcl: Changed -password option to -passwordcommand to avoid
+	  clash with password for proxy.
+
  2009-02-09  Sergei Golovan  <sgolovan at nes.ru>

  	* xmpp/https.tcl: Changed HTTP protocol version in CONNECT query

Modified: trunk/xmpp/tls.tcl
==============================================================================
--- trunk/xmpp/tls.tcl	(original)
+++ trunk/xmpp/tls.tcl	Tue Feb 10 10:31:07 2009
@@ -59,6 +59,8 @@
  #       -eofcommand           cmd4  End-of-file callback.
  #       -verifycommand              TLS callback (it turns into -command  
option
  #                                   for ::tls::import).
+#       -passwordcommand      cmd5  TLS password callback (it turns into
+#                                   -password option for ::tls::import).
  #       -infocommand                Callback to get status of an  
established
  #                                   TLS connection. It is calles wit a  
list of
  #                                   key-value pairs returned from  
tls::status.
@@ -75,7 +77,6 @@
  #       -tls1
  #       -request
  #       -require
-#       -password
  #       (other arguments are passed to [::pconnect::socket])
  #       -domain string              "inet" (default) or "inet6"
  #       -proxy string               Proxy type "" (default), "socks4",
@@ -134,7 +135,7 @@
              -tls1                 -
              -request              -
              -require              -
-            -password             -
+            -passwordcommand      -
              -verifycommand        -
              -infocommand          {lappend tlsArgs $key $val}
              default               {lappend newArgs $key $val}
@@ -227,6 +228,8 @@
  #
  # Arguments:
  #       token                   Transport control token.
+#       -passwordcommand        TLS password callback (it turns into  
-password
+#                               option for ::tls::import).
  #       -verifycommand          TLS callback (it turns into -command option
  #                               for ::tls::import).
  #       -infocommand            Callback to get status of an established
@@ -245,7 +248,6 @@
  #       -tls1
  #       -request
  #       -require
-#       -password
  #
  # Result:
  #       Empty string.
@@ -266,6 +268,9 @@
                  } else {
                      lappend newArgs -cafile $val
                  }
+            }
+            -passwordcommand {
+                lappend newArgs -password $val
              }
              -verifycommand {
                  lappend newArgs -command $val


More information about the Tkabber-dev mailing list