#ifndef _GLOBALS_H
#define _GLOBALS_H
+#include "alias.h"
+
#include "lib/str.h"
#include "lib/list.h"
#include "lib/rx.h"
WHERE char *DsnNotify;
WHERE char *DsnReturn;
WHERE char *Editor;
+WHERE char *EditorHeaders;
WHERE char *EscChar;
WHERE char *FileCharset;
WHERE char *FolderFormat;
WHERE char *ImapDelimChars INITVAL (NULL);
WHERE char *ImapHeaders;
WHERE char *ImapHomeNamespace INITVAL (NULL);
+WHERE char *ImapLogin INITVAL (NULL);
WHERE char *ImapPass INITVAL (NULL);
WHERE char *ImapUser INITVAL (NULL);
#endif
WHERE char *MsgFmt;
WHERE char *MsgIdFormat;
+WHERE rx_t AttachRemindRegexp;
WHERE rx_t Mask;
WHERE rx_t QuoteRegexp;
WHERE rx_t ReplyRegexp;
#ifdef USE_SOCKET
WHERE char *Preconnect INITVAL (NULL);
WHERE char *Tunnel INITVAL (NULL);
+WHERE short NetInc;
#endif /* USE_SOCKET */
#ifdef MIXMASTER
#if defined(USE_LIBESMTP)
WHERE char *SmtpAuthUser;
WHERE char *SmtpAuthPass;
+WHERE char *SmtpEnvFrom;
WHERE char *SmtpHost;
WHERE unsigned short SmtpPort;
+WHERE char *SmtpUseTLS;
#endif
WHERE char *Spoolfile;
WHERE char *SpamSep;
-#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
WHERE char *SslCertFile INITVAL (NULL);
#endif
-#if defined(USE_SSL) || defined(USE_NSS)
+#if defined(USE_SSL)
WHERE char *SslEntropyFile INITVAL (NULL);
#endif
#ifdef USE_SSL
WHERE char *SslClientCert INITVAL (NULL);
+WHERE LIST *SslSessionCerts INITVAL (NULL);
#endif
#ifdef USE_GNUTLS
WHERE short SslDHPrimeBits;
WHERE char *Username;
WHERE char *Visual;
WHERE char *XtermTitle;
+WHERE char *XtermLeave;
WHERE char *XtermIcon;
WHERE char *CurrentFolder;
WHERE short Umask INITVAL (0077);
WHERE short WrapMargin;
WHERE short WriteInc;
+WHERE short MaxDispRecips;
WHERE short MaxLineLength;
WHERE short ScoreThresholdDelete;