rework some things with sasl.

[apps/madmutt.git] / init.c

diff --git a/init.c b/init.c
index fb2f8a6..b0f4ac3 100644 (file)
--- a/init.c
+++ b/init.c
@@ -14,18 +14,17 @@
 
 #include <lib-lua/lib-lua.h>
 #include <lib-sys/unix.h>
-#include <lib-sys/mutt_ssl.h>
 #include <lib-ui/curses.h>
 #include <lib-ui/history.h>
 #include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
 
 #include "mutt.h"
 #include "keymap.h"
+#include "crypt.h"
 #include "charset.h"
 #include "thread.h"
 #include "mutt_idna.h"
-#include "mutt_libesmtp.h"
+#include "send_smtp.h"
 #include "alias.h"
 #include "init.h"
 
@@ -83,8 +82,8 @@ static struct {
   int (*check) (const char* option, unsigned long val,
                 char* errbuf, ssize_t errlen);
 } SpecialVars[] = {
-#if defined (USE_LIBESMTP) && (defined (USE_SSL) || defined (USE_GNUTLS))
-  { "smtp_use_tls",             mutt_libesmtp_check_usetls },
+#ifdef USE_LIBESMTP
+  { "smtp_use_tls",             send_smtp_check_usetls },
 #endif
   { "history",                  check_history },
   { "pager_index_lines",        check_num },