ESMTP is utterly broken, and pulls OpenSSL.

[apps/madmutt.git] / init.h

diff --git a/init.h b/init.h
index 648e0c5..456f55b 100644 (file)
--- a/init.h
+++ b/init.h
@@ -66,21 +66,6 @@ struct option_t {
 
 /* build complete documentation */
 
-#ifdef _MAKEDOC
-# ifndef USE_LIBESMTP
-#  define USE_LIBESMTP
-# endif
-# ifndef USE_NNTP
-#  define USE_NNTP
-# endif
-# ifndef USE_HCACHE
-#  define USE_HCACHE
-# endif
-# ifndef HAVE_LIBIDN
-#  define HAVE_LIBIDN
-# endif
-#endif
-
 struct option_t MuttVars[] = {
   /*++*/
   {"abort_noattach", DT_QUAD, R_NONE, OPT_ATTACH, "no" },
@@ -622,14 +607,6 @@ struct option_t MuttVars[] = {
    ** .te
    */
 #endif
-  {"hdrs", DT_BOOL, R_NONE, OPTHDRS, "yes" },
-  /*
-   ** .pp
-   ** When \fIunset\fP, the header fields normally added by the ``$my_hdr''
-   ** command are not created.  This variable \fImust\fP be \fIunset\fP before
-   ** composing a new message or replying in order to take effect.  If \fIset\fP,
-   ** the user defined header fields are added to every new message.
-   */
   {"header", DT_BOOL, R_NONE, OPTHEADER, "no" },
   /*
    ** .pp
@@ -761,13 +738,6 @@ struct option_t MuttVars[] = {
    ** .pp
    ** \fBNote:\fP This is a space separated list.
    */
-  {"imap_home_namespace", DT_STR, R_NONE, UL &ImapHomeNamespace, "" },
-  /*
-   ** .pp
-   ** You normally want to see your personal folders alongside
-   ** your \fTINBOX\fP in the IMAP browser. If you see something else, you may set
-   ** this variable to the IMAP path to your folders.
-   */
   {"imap_keepalive", DT_NUM, R_NONE, UL &ImapKeepalive, "900" },
   /*
    ** .pp
@@ -823,14 +793,6 @@ struct option_t MuttVars[] = {
    ** user/password pairs on Madmutt invocation, or if opening the connection
    ** is slow.
    */
-  {"imap_peek", DT_BOOL, R_NONE, OPTIMAPPEEK, "yes" },
-  /*
-   ** .pp
-   ** If \fIset\fP, Madmutt will avoid implicitly marking your mail as read whenever
-   ** you fetch a message from the server. This is generally a good thing,
-   ** but can make closing an IMAP folder somewhat slower. This option
-   ** exists to appease speed freaks.
-   */
   {"imap_reconnect", DT_QUAD, R_NONE, OPT_IMAPRECONNECT, "ask-yes" },
   /*
    ** .pp
@@ -869,12 +831,6 @@ struct option_t MuttVars[] = {
    ** Controls whether or not a copy of the message(s) you are replying to
    ** is included in your reply.
    */
-  {"include_onlyfirst", DT_BOOL, R_NONE, OPTINCLUDEONLYFIRST, "no" },
-  /*
-   ** .pp
-   ** Controls whether or not Madmutt includes only the first attachment
-   ** of the message you are replying.
-   */
   {"indent_string", DT_STR, R_NONE, UL &Prefix, "> "},
   /*
    ** .pp
@@ -1534,7 +1490,6 @@ struct option_t MuttVars[] = {
    ** checked with the check-traditional-pgp function, Madmutt will automatically
    ** check the message for traditional pgp.
    */
-  /* XXX Default values! */
   {"forward_decrypt", DT_BOOL, R_NONE, OPTFORWDECRYPT, "yes" },
   /*
    ** .pp
@@ -1561,64 +1516,6 @@ struct option_t MuttVars[] = {
    ** keyid (the hash-value that OpenSSL generates) to work properly
    ** (S/MIME only)
    */
-#if defined(USE_LIBESMTP)
-  {"smtp_user", DT_STR, R_NONE, UL &SmtpAuthUser, "" },
-  /*
-   ** .pp
-   ** Availability: SMTP
-   **
-   ** .pp
-   ** Defines the username to use with SMTP AUTH.  Setting this variable will
-   ** cause Madmutt to attempt to use SMTP AUTH when sending.
-   */
-  {"smtp_pass", DT_STR, R_NONE, UL &SmtpAuthPass, "" },
-  /*
-   ** .pp
-   ** Availability: SMTP
-   **
-   ** .pp
-   ** Defines the password to use with SMTP AUTH.  If ``$$smtp_user''
-   ** is set, but this variable is not, you will be prompted for a password
-   ** when sending.
-   ** .pp
-   ** \fBNote:\fP Storing passwords in a configuration file
-   ** presents a security risk since the superuser of your machine may read it
-   ** regardless of the file's permissions.
-   */
-  {"smtp_host", DT_STR, R_NONE, UL &SmtpHost, "" },
-  /*
-   ** .pp
-   ** Availability: SMTP
-   **
-   ** .pp
-   ** Defines the SMTP host which will be used to deliver mail, as opposed
-   ** to invoking the sendmail binary.  Setting this variable overrides the
-   ** value of ``$$sendmail'', and any associated variables.
-   */
-  {"smtp_port", DT_NUM, R_NONE, UL &SmtpPort, "25" },
-  /*
-   ** .pp
-   ** Availability: SMTP
-   **
-   ** .pp
-   ** Defines the port that the SMTP host is listening on for mail delivery.
-   ** Must be specified as a number.
-   ** .pp
-   ** Defaults to 25, the standard SMTP port, but RFC 2476-compliant SMTP
-   ** servers will probably desire 587, the mail submission port.
-   */
-  {"smtp_use_tls", DT_STR, R_NONE, UL &SmtpUseTLS, "" },
-  /*
-   ** .pp
-   ** Availability: SMTP
-   **
-   ** .pp
-   ** Defines wether to use STARTTLS. If this option is set to ``\fIrequired\fP''
-   ** and the server does not support STARTTLS or there is an error in the
-   ** TLS Handshake, the connection will fail. Setting this to ``\fIenabled\fP''
-   ** will try to start TLS and continue without TLS in case of an error.
-   */
-#endif
   {"pipe_split", DT_BOOL, R_NONE, OPTPIPESPLIT, "no" },
   /*
    ** .pp