X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_libesmtp.c;h=a7f65cef23428f00f8ebc9ede4fd7256cbc0c354;hp=31a4b8e29c23c48cb6f543dd114f15fcc8019377;hb=69bd7df1ce9e5c6a64b5128f85c1f91912d2f510;hpb=f7a7cee0f8bce7ddc378197a9394c6fceb6988ec

diff --git a/mutt_libesmtp.c b/mutt_libesmtp.c
index 31a4b8e..a7f65ce 100644
--- a/mutt_libesmtp.c
+++ b/mutt_libesmtp.c
@@ -279,13 +279,29 @@ static void do_dsn_ret (smtp_message_t message) {
     smtp_dsn_set_ret (message, Ret_FULL);
 }
 
+#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
+int mutt_libesmtp_check_usetls (const char* option, unsigned long p,
+                                char* errbuf, size_t errlen) {
+  char* val = (char*) p;
+  if (!val || !*val)
+    return (1);
+  if (str_ncmp (val, "enabled", 7) != 0 &&
+      str_ncmp (val, "required", 8) != 0) {
+    if (errbuf)
+      snprintf (errbuf, errlen, _("'%s' is invalid for %s"), val, option);
+    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)