Sendmail args to exec.command should be a list

Author: cez81

modules/mailer/mailer.go

@@ -209,7 +209,7 @@ func (s *sendmailSender) Send(from string, to []string, msg io.WriterTo) error {
 	var waitError error
 
 	args := []string{"-F", from, "-i"}
-	args = append(args, setting.MailService.SendmailArgs)
+	args = append(args, setting.MailService.SendmailArgs...)
 	args = append(args, to...)
 	log.Trace("Sending with: %s %v", setting.MailService.SendmailPath, args)
 	cmd := exec.Command(setting.MailService.SendmailPath, args...)

modules/setting/setting.go

@@ -1326,7 +1326,7 @@ type Mailer struct {
 	// Sendmail sender
 	UseSendmail  bool
 	SendmailPath string
-	SendmailArgs string
+	SendmailArgs []string
 }
 
 var (
@@ -1358,7 +1358,7 @@ func newMailService() {
 
 		UseSendmail:  sec.Key("USE_SENDMAIL").MustBool(),
 		SendmailPath: sec.Key("SENDMAIL_PATH").MustString("sendmail"),
-		SendmailArgs: sec.Key("SENDMAIL_ARGS").MustString(""),
+		SendmailArgs: sec.Key("SENDMAIL_ARGS").Strings(" "),
 	}
 	MailService.From = sec.Key("FROM").MustString(MailService.User)