mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-05 05:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: make tls_client configuration work in target.smtp block

Browse source
This commit is contained in:
Mark Lipscombe 2025-02-10 08:41:48 -05:00
parent 01c65cfb0e
commit 0e953a824b
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/target/smtp/smtp_downstream.go
View file

@ -57,7 +57,7 @@ type Downstream struct {
hostname string hostname string
endpoints []config.Endpoint endpoints []config.Endpoint
saslFactory saslClientFactory saslFactory saslClientFactory
tlsConfig tls.Config tlsConfig *tls.Config
connectTimeout time.Duration connectTimeout time.Duration
commandTimeout time.Duration commandTimeout time.Duration
@ -229,9 +229,9 @@ func (d *delivery) connect(ctx context.Context) error {
for _, endp := range d.u.endpoints { for _, endp := range d.u.endpoints {
var err error var err error
if d.u.lmtp { if d.u.lmtp {
_, err = conn.ConnectLMTP(ctx, endp, d.u.starttls, &d.u.tlsConfig) _, err = conn.ConnectLMTP(ctx, endp, d.u.starttls, d.u.tlsConfig)
} else { } else {
_, err = conn.Connect(ctx, endp, d.u.starttls, &d.u.tlsConfig) _, err = conn.Connect(ctx, endp, d.u.starttls, d.u.tlsConfig)
} }
if err != nil { if err != nil {
if len(d.u.endpoints) != 1 { if len(d.u.endpoints) != 1 {

2
internal/target/smtp/smtp_downstream_test.go
View file

@ -221,7 +221,7 @@ func TestDownstreamDelivery_StartTLS(t *testing.T) {
Port: testPort, Port: testPort,
}, },
}, },
tlsConfig: *clientCfg.Clone(), tlsConfig: clientCfg.Clone(),
starttls: true, starttls: true,
log: testutils.Logger(t, "target.smtp"), log: testutils.Logger(t, "target.smtp"),
} }