mirror of
https://github.com/wiggin77/mailrelay.git
synced 2025-08-12 16:37:06 +02:00
Do not auth unless we have something to auth with
This commit is contained in:
@ -105,14 +105,14 @@ func handshake(client *smtp.Client, config *relayConfig, tlsConfig *tls.Config)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
var auth smtp.Auth
|
var auth smtp.Auth = nil
|
||||||
if config.LoginAuthType {
|
if config.LoginAuthType {
|
||||||
auth = LoginAuth(config.Username, config.Password)
|
auth = LoginAuth(config.Username, config.Password)
|
||||||
} else {
|
} else if config.Username != "" {
|
||||||
auth = smtp.PlainAuth("", config.Username, config.Password, config.Server)
|
auth = smtp.PlainAuth("", config.Username, config.Password, config.Server)
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := client.Auth(auth); err != nil {
|
if auth != nil && err := client.Auth(auth); err != nil {
|
||||||
return errors.Wrap(err, "auth error")
|
return errors.Wrap(err, "auth error")
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
Reference in New Issue
Block a user