X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnotify_email.c;h=24c66ec051b965aa5cbfedd228d774430d951c53;hb=da658a37ddd9421752903c4ff5f2aa83320387c5;hp=08f865fc2c57805866ce3475a3ec9b3a77ed0e9a;hpb=61a1fa91ba73e4fe3a34949f77c5f017056f2b7a;p=collectd.git

diff --git a/src/notify_email.c b/src/notify_email.c
index 08f865fc..24c66ec0 100644
--- a/src/notify_email.c
+++ b/src/notify_email.c
@@ -229,6 +229,7 @@ static int notify_email_notification (const notification_t *n,
     user_data_t __attribute__((unused)) *user_data)
 {
 
+  time_t tt;
   struct tm timestamp_tm;
   char timestamp_str[64];
 
@@ -248,7 +249,8 @@ static int notify_email_notification (const notification_t *n,
       (email_subject == NULL) ? DEFAULT_SMTP_SUBJECT : email_subject,
       severity, n->host);
 
-  localtime_r (&n->time, &timestamp_tm);
+  tt = CDTIME_T_TO_TIME_T (n->time);
+  localtime_r (&tt, &timestamp_tm);
   strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
       &timestamp_tm);
   timestamp_str[sizeof (timestamp_str) - 1] = '\0';
@@ -256,7 +258,7 @@ static int notify_email_notification (const notification_t *n,
   /* Let's make RFC822 message text with \r\n EOLs */
   ssnprintf (buf, buf_len,
       "MIME-Version: 1.0\r\n"
-      "Content-Type: text/plain;\r\n"
+      "Content-Type: text/plain; charset=\"US-ASCII\"\r\n"
       "Content-Transfer-Encoding: 8bit\r\n"
       "Subject: %s\r\n"
       "\r\n"
@@ -298,14 +300,11 @@ static int notify_email_notification (const notification_t *n,
     return (-1);
   } else {
     #if COLLECT_DEBUG
-      const smtp_status_t *status;
-      /* Report on the success or otherwise of the mail transfer. */
-      status = smtp_message_transfer_status (message);
-      DEBUG ("notify_email plugin: SMTP server report: %d %s",
-        status->code, (status->text != NULL) ? status->text : "\n");
-    #else
-      //I don't know if the function below has side affects so i'm calling it to be on the safe side.
-      smtp_message_transfer_status (message);
+    const smtp_status_t *status;
+    /* Report on the success or otherwise of the mail transfer. */
+    status = smtp_message_transfer_status (message);
+    DEBUG ("notify_email plugin: SMTP server report: %d %s",
+      status->code, (status->text != NULL) ? status->text : "\n");
     #endif
     smtp_enumerate_recipients (message, print_recipient_status, NULL);
   }