mirror of
				https://github.com/axllent/mailpit.git
				synced 2025-10-31 00:07:43 +02:00 
			
		
		
		
	Fix: Fix sendmail when using an  --smtp-addr <ip>:<port> (#542)
				
					
				
			This commit is contained in:
		| @@ -8,7 +8,6 @@ import ( | ||||
| 	"net" | ||||
| 	"net/mail" | ||||
| 	"net/smtp" | ||||
| 	"net/url" | ||||
| 	"os" | ||||
| 	"strings" | ||||
|  | ||||
| @@ -75,12 +74,6 @@ func Send(addr string, from string, to []string, msg []byte) error { | ||||
| } | ||||
|  | ||||
| func sendMail(addr string, a smtp.Auth, from string, to []string, msg []byte) error { | ||||
| 	addrParsed, err := url.Parse(addr) // ensure addr is a valid URL | ||||
| 	if err != nil { | ||||
| 		return fmt.Errorf("invalid address: %s", addr) | ||||
| 	} | ||||
|  | ||||
| 	host := addrParsed.Host | ||||
| 	if err := validateLine(from); err != nil { | ||||
| 		return err | ||||
| 	} | ||||
| @@ -102,7 +95,7 @@ func sendMail(addr string, a smtp.Auth, from string, to []string, msg []byte) er | ||||
| 	} | ||||
|  | ||||
| 	if ok, _ := c.Extension("STARTTLS"); ok { | ||||
| 		config := &tls.Config{ServerName: host, InsecureSkipVerify: true} // #nosec | ||||
| 		config := &tls.Config{ServerName: addr, InsecureSkipVerify: true} // #nosec | ||||
| 		if err = c.StartTLS(config); err != nil { | ||||
| 			return err | ||||
| 		} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user