Merge pull request #678 from timopollmeier/sendmail-args

Use read instead of xargs for sendmail (master)

CHANGELOG.md

@@ -30,7 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Update Postgres to SQLite migration. [#581](https://github.com/greenbone/gvmd/pull/581) [#601](https://github.com/greenbone/gvmd/pull/601) [#604](https://github.com/greenbone/gvmd/pull/604) [#605](https://github.com/greenbone/gvmd/pull/605)
 - Update result diff generation at delta reports [#650](https://github.com/greenbone/gvmd/pull/650)
 - Check and create default permissions individually [#671](https://github.com/greenbone/gvmd/pull/671)
-- Add -f arg to sendmail call in email alert [#676](https://github.com/greenbone/gvmd/pull/676)
+- Add -f arg to sendmail call in email alert [#676](https://github.com/greenbone/gvmd/pull/676) [#678](https://github.com/greenbone/gvmd/pull/678)
 
 ### Fixed
 - Fix iCalendar recurrence and timezone handling [#654](https://github.com/greenbone/gvmd/pull/654)

src/manage_sql.c

@@ -9506,7 +9506,7 @@ email (const char *to_address, const char *from_address, const char *subject,
       return -1;
     }
 
-  sendmail_args = g_strdup_printf ("-f %s %s",
+  sendmail_args = g_strdup_printf ("%s %s",
                                    from_address,
                                    to_address);
   g_file_set_contents (args_file_name,
@@ -9524,8 +9524,8 @@ email (const char *to_address, const char *from_address, const char *subject,
       return -1;
     }
 
-  command = g_strdup_printf ("xargs -a %s -I XXX"
-                             " /usr/sbin/sendmail XXX < %s"
+  command = g_strdup_printf ("read FROM TO < %s;"
+                             " /usr/sbin/sendmail -f \"$FROM\" \"$TO\" < %s"
                              " > /dev/null 2>&1",
                              args_file_name,
                              content_file_name);