X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=9b1d1c15b70a4effe647faf559ce9375266fb4ac;hp=850e5aad1921db5eb390f9768b3631c18f2adf74;hb=1601b25fd310dd65a6b6d1b49f2e16f55560ac9d;hpb=dc2c2ef1ba4d0a0f3c2552459b9f962594a3536b

diff --git a/globals.h b/globals.h
index 850e5aa..9b1d1c1 100644
--- a/globals.h
+++ b/globals.h
@@ -9,6 +9,8 @@
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
 
+#include "alias.h"
+
 #include "lib/str.h"
 #include "lib/list.h"
 #include "lib/rx.h"
@@ -136,26 +138,28 @@ WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
 WHERE char *Signature;
-WHERE char *SignOffString;
 WHERE char *SimpleSearch;
 
 #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;
@@ -224,6 +228,7 @@ WHERE short Timeout;
 WHERE short Umask INITVAL (0077);
 WHERE short WrapMargin;
 WHERE short WriteInc;
+WHERE short MaxDispRecips;
 WHERE short MaxLineLength;
 
 WHERE short ScoreThresholdDelete;