From: Thomas Roessler <roessler@does-not-exist.org>
Date: Thu, 3 Jan 2002 20:57:19 +0000 (+0000)
Subject: Move some globals where they belong.  From Brendan Cully.
X-Git-Tag: mutt-1-3-26-rel~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3ad401146042ea08d466916ec28749ff83018d6;p=mutt

Move some globals where they belong.  From Brendan Cully.
---

diff --git a/globals.h b/globals.h
index b9b8d81e..738cbfb5 100644
--- 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 f1739c51..5eee5ad5 100644
--- 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 67917035..37e0af26 100644
--- 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 15749d6a..abd91fba 100644
--- 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.