Move some globals where they belong. From Brendan Cully.

diff --git a/globals.h b/globals.h
index b9b8d81ec2a28bd571975947deb2ac4fda0ef6b3..738cbfb55052ad8d6f223da8da4ca5afdc5df084 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -101,6 +101,10 @@ WHERE char *Shell;
 WHERE char *Signature;
 WHERE char *SimpleSearch;
 WHERE char *Spoolfile;
+#if defined(USE_SSL) || defined(USE_NSS)
+WHERE char *SslCertFile INITVAL (NULL);
+WHERE char *SslEntropyFile INITVAL (NULL);
+#endif
 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tempdir;

diff --git a/mutt_ssl.c b/mutt_ssl.c
index f1739c51f0543eddce25de2d7cb3848730b800d3..5eee5ad5a8e43aa5dc1bcd40a51a803f2cfef4eb 100644 (file)
--- a/mutt_ssl.c
+++ b/mutt_ssl.c
@@ -57,9 +57,6 @@ static int entropy_byte_count = 0;
 #define HAVE_ENTROPY() (!access(DEVRANDOM, R_OK) || entropy_byte_count >= 16)
 #endif
 
-char *SslCertFile = NULL;
-char *SslEntropyFile = NULL;
-
 typedef struct _sslsockdata
 {
   SSL_CTX *ctx;

diff --git a/mutt_ssl.h b/mutt_ssl.h
index 6791703561fddcbbcbd148eb3ef6e216d2b8dd13..37e0af265be48cd9b26300b073ddff3483d04037 100644 (file)
--- a/mutt_ssl.h
+++ b/mutt_ssl.h
@@ -21,9 +21,6 @@
 
 #include "mutt_socket.h"
 
-extern char *SslCertFile;
-extern char *SslEntropyFile;
-
 int mutt_ssl_starttls (CONNECTION* conn);
 
 extern int ssl_socket_setup (CONNECTION *conn);

diff --git a/mutt_ssl_nss.c b/mutt_ssl_nss.c
index 15749d6afa02ae939ca855a7b5873e8f6f2c4f08..abd91fbaea7bdbfe242e5225d60a4d955b0380bd 100644 (file)
--- a/mutt_ssl_nss.c
+++ b/mutt_ssl_nss.c
@@ -31,9 +31,6 @@
 
 static int MuttNssInitialized = 0;
 
-char *SslCertFile = 0;
-char *SslEntropyFile = 0;      /* unused, required to link */
-
 /* internal data struct we use with the CONNECTION.  this is where NSS-specific
  * data gets stuffed so that the main mutt_socket.h doesn't have to be
  * modified.