X-Git-Url: http://git.madism.org/?a=blobdiff_plain;ds=sidebyside;f=init.h;h=456f55b22582d17bd6cc9d9b95bab3a6562a9c45;hb=4f8cd7c03aba20081ae3403ee194ce7e54f224fd;hp=89dcb12502f37d420f1f133dd585fd4c35e0aef2;hpb=e87df0bb071ba21d6e3d6a47cb797c135605eba5;p=apps%2Fmadmutt.git diff --git a/init.h b/init.h index 89dcb12..456f55b 100644 --- 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" }, @@ -1531,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