Attachment "diff.txt" to
ticket [83d674b2dd]
added by
anonymous
2018-05-18 05:44:16.
--- tclradmailsmtp.tcl 2018-05-08 14:31:56.000000000 +0200
+++ /opt/tclrad/lib/tcllib1.19/mime/smtp.tcl 2017-08-08 01:35:08.000000000 +0200
@@ -1,4 +1,3 @@
-# MODIFICATO DALLO STD IN ATTESA DI CHIUSURA MIO TICKET
# smtp.tcl - SMTP client
#
# Copyright (c) 1999-2000 Marshall T. Rose
@@ -102,8 +101,6 @@
# some reason. Return 'insecure' to continue with
# normal SMTP or 'secure' to close the connection and
# try another server.
-# -tlsimport after a succesfull socket command, import tls on
-# channel - used for native smtps negotiation
# -username These are needed if your SMTP server requires
# -password authentication.
#
@@ -132,7 +129,6 @@
set ports [list 25]
set tlsP 1
set tlspolicy {}
- set tlsimport 0
set username {}
set password {}
@@ -158,7 +154,6 @@
-queue {set queueP [boolean $value]}
-usetls {set tlsP [boolean $value]}
-tlspolicy {set tlspolicy $value}
- -tlsimport {set tlsimport $value}
-maxsecs {set maxsecs [expr {$value < 0 ? 0 : $value}]}
-header {
if {[llength $value] != 2} {
@@ -426,7 +421,7 @@
-maxsecs $maxsecs -usetls $tlsP \
-multiple $bccP -queue $queueP \
-servers $servers -ports $ports \
- -tlspolicy $tlspolicy -tlsimport $tlsimport \
+ -tlspolicy $tlspolicy \
-username $username -password $password]
if {![string match "::smtp::*" $token]} {
@@ -600,8 +595,6 @@
# the request (one port per server-- defaults to 25).
# -usetls A boolean to indicate we will use TLS if possible.
# -tlspolicy Command called if TLS setup fails.
-# -tlsimport after a succesfull socket command, import tls on
-# channel - used for native smtps negotiation
# -username These provide the authentication information
# -password to be used if needed by the SMTP server.
#
@@ -623,7 +616,6 @@
array set options [list -debug 0 -client localhost -multiple 1 \
-maxsecs 120 -queue 0 -servers localhost \
-ports 25 -usetls 1 -tlspolicy {} \
- -tlsimport 0 \
-username {} -password {}]
array set options $args
set state(options) [array get options]
@@ -650,7 +642,6 @@
if {[set code [catch {
set state(sd) [socket -async $server $port]
- if { $options(-tlsimport) } { tls::import $state(sd) }
fconfigure $state(sd) -blocking off -translation binary
fileevent $state(sd) readable [list ::smtp::readable $token]
} result]]} {