X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=7b3ada3b1da89cd622cbec5b31b395a74717b9d1;hp=37b4f88ea1a106eb082d41a8234689fa87d8c183;hb=b22469b2a06ebeccacae75e69ee5931660eb3eed;hpb=17c3e8818f544a89c845331886c322049c7d2fa6

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 37b4f88..7b3ada3 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -2,6 +2,10 @@
  * Copyright notice from original mutt:
  * [none]
  *
+ * Parts were written/modified by:
+ * Christian Gall <cg@cgall.de>
+ * Rocco Rutte <pdmef@cs.tu-berlin.de>
+ *
  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
@@ -49,6 +53,8 @@ static char authpass[STRING] = "";
     _mutt_libesmtp_perror(msg); \
     FAIL(); \
   } while (0)
+#define extna(msg) { mutt_error (_("SMTP Extension '%s' not supported by MTA."), \
+                                 msg); sleep (1); }
 
 /*
  * _mutt_libesmtp_ensure_init
@@ -177,7 +183,7 @@ static int handle_invalid_peer_certificate (long vfy_result) {
 }
 #endif
 
-void event_cb (smtp_session_t session, int event_no, void *arg,...)
+static void event_cb (smtp_session_t session, int event_no, void *arg,...)
 { 
   va_list alist;
   int *ok;
@@ -226,20 +232,69 @@ void event_cb (smtp_session_t session, int event_no, void *arg,...)
     sleep(1);
     *ok = 1; break;
   }
+  case SMTP_EV_EXTNA_DSN:
+    extna ("DSN");
+    break;
+  case SMTP_EV_EXTNA_STARTTLS:
+    extna ("StartTLS");
+    break;
+  case SMTP_EV_EXTNA_8BITMIME:
+    extna ("8BITMIME");
+    break;
   default:
-    mutt_message(_("Got event: %d - ignored."), event_no);
+    mutt_message(_("Got unhandled event ID = %d - ignored."), event_no);
     sleep(1);
   }
   va_end(alist);
 }
 
+static void do_dsn_notify (smtp_message_t message, const char* from) {
+  int flags = Notify_NOTSET;
+  smtp_recipient_t self = NULL;
+
+  if (!DsnNotify || !*DsnNotify || !message || !from || !*from || 
+      strstr (DsnNotify, "never") != NULL)
+    return;
+
+  if (strstr (DsnNotify, "failure") != NULL)
+    flags |= Notify_FAILURE;
+  if (strstr (DsnNotify, "delay") != NULL)
+    flags |= Notify_DELAY;
+  if (strstr (DsnNotify, "success") != NULL)
+    flags |= Notify_SUCCESS;
+
+  if (flags != Notify_NOTSET) {
+    if (!(self = smtp_add_recipient (message, from)))
+      return;
+    smtp_dsn_set_notify (self, flags);
+  }
+}
+
+static void do_dsn_ret (smtp_message_t message) {
+  if (!DsnReturn || !*DsnReturn || !message)
+    return;
+  if (ascii_strncasecmp (DsnReturn, "hdrs", 4) == 0)
+    smtp_dsn_set_ret (message, Ret_HDRS);
+  else if (ascii_strncasecmp (DsnReturn, "full", 4) == 0)
+    smtp_dsn_set_ret (message, Ret_FULL);
+}
+
+#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+int mutt_libesmtp_check_usetls (const char* val) {
+  if (str_ncmp (val, "enabled", 7) != 0 &&
+      str_ncmp (val, "required", 8) != 0)
+    return (0);
+  return (1);
+}
+#endif
+
 /*
- * mutt_invoke_libesmtp
+ * mutt_libesmtp_invoke
  *   Sends a mail message to the provided recipients using libesmtp.
  *   Returns 0 upon success, -1 upon failure (and prints an error
  *   message).
  */
-int mutt_invoke_libesmtp (ADDRESS * from,       /* the sender */
+int mutt_libesmtp_invoke (ADDRESS * from,       /* the sender */
                           ADDRESS * to, ADDRESS * cc, ADDRESS * bcc,    /* recips */
                           const char *msg,      /* file containing message */
                           int eightbit)
@@ -252,6 +307,7 @@ int mutt_invoke_libesmtp (ADDRESS * from,       /* the sender */
   FILE *fp = NULL;
   auth_context_t authctx = NULL;
   const smtp_status_t *status;
+  char* envfrom = from->mailbox;
 
   _mutt_libesmtp_ensure_init ();
 
@@ -277,11 +333,7 @@ int mutt_invoke_libesmtp (ADDRESS * from,       /* the sender */
   if (SmtpAuthUser) {
     if ((authctx = auth_create_context ()) == NULL)
       MSGFAIL ("auth_create_context failed");
-#if defined (USE_SSL) || (defined (USE_GNUTLS) && defined (HAVE_GNUTLS_OPENSSL_H))
-    auth_set_mechanism_flags (authctx, AUTH_PLUGIN_EXTERNAL, 0);
-#else
     auth_set_mechanism_flags (authctx, AUTH_PLUGIN_PLAIN, 0);
-#endif
     auth_set_interact_cb (authctx, _mutt_libesmtp_auth_interact, NULL);
 
     if (!smtp_auth_set_context (session, authctx))
@@ -295,10 +347,21 @@ int mutt_invoke_libesmtp (ADDRESS * from,       /* the sender */
 
   if ((message = smtp_add_message (session)) == NULL)
     SMTPFAIL ("smtp_add_message");
+
   /*  Initialize envelope sender */
-  if (!smtp_set_reverse_path (message, from->mailbox))
+  if (SmtpEnvFrom && *SmtpEnvFrom)
+    envfrom = SmtpEnvFrom;
+  if (!smtp_set_reverse_path (message, envfrom))
     SMTPFAIL ("smtp_set_reverse_path");
 
+  /* set up DSN for message */
+  do_dsn_notify (message, envfrom);
+  do_dsn_ret (message);
+
+  /* set up 8bitmime flag */
+  if (eightbit && option (OPTUSE8BITMIME))
+    smtp_8bitmime_set_body (message, E8bitmime_8BITMIME);
+
   if ((fp = fopen (msg, "r")) == NULL)
     LIBCFAIL ("fopen");
   if (!smtp_set_messagecb (message, _mutt_libesmtp_messagefp_cb, fp))