summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Chappa <chappa@washington.edu>2020-01-29 22:42:28 -0700
committerEduardo Chappa <chappa@washington.edu>2020-01-29 22:42:28 -0700
commitf28ae01c8a4e6deb58fd4cee528e064c9b985129 (patch)
treecab85f573f234350578df77cf4d7f2d977d8c3be
parent2495c941ce924ff6b47dc22f72f96a7223bc97a4 (diff)
downloadalpine-f28ae01c8a4e6deb58fd4cee528e064c9b985129.tar.xz
* Remove default value for system-certs-path.
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac2
-rw-r--r--include/config.h.in3
-rw-r--r--include/config.wnt.h1
-rw-r--r--pith/conf.c4
-rw-r--r--pith/pine.hlp2
6 files changed, 3 insertions, 15 deletions
diff --git a/configure b/configure
index dc5492a9..a7a8ee62 100755
--- a/configure
+++ b/configure
@@ -21814,12 +21814,6 @@ else
$as_echo "$as_me: SSL Problem: certificate directory not found" >&6;}
fi
-
-cat >>confdefs.h <<_ACEOF
-#define DEFAULT_SSLCAPATH "$certdir"
-_ACEOF
-
-
if test "x$with_smime" != "xno" ; then
if test -n "$certdir" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: * * * S/MIME support enabled" >&5
diff --git a/configure.ac b/configure.ac
index ac90e420..bf5762db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2080,8 +2080,6 @@ else
AC_MSG_NOTICE([SSL Problem: certificate directory not found])
fi
- AC_DEFINE_UNQUOTED([DEFAULT_SSLCAPATH],"$certdir",[Directory where system certificates are located])
-
if test "x$with_smime" != "xno" ; then
if test -n "$certdir" ; then
AC_MSG_NOTICE([* * * S/MIME support enabled])
diff --git a/include/config.h.in b/include/config.h.in
index 6a13eefe..19d7b34d 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -42,9 +42,6 @@
/* Default configuration value */
#undef DEFAULT_SAVE
-/* Directory where system certificates are located */
-#undef DEFAULT_SSLCAPATH
-
/* Default configuration value */
#undef DF_AB_SORT_RULE
diff --git a/include/config.wnt.h b/include/config.wnt.h
index 65f14725..e8d22ff5 100644
--- a/include/config.wnt.h
+++ b/include/config.wnt.h
@@ -557,7 +557,6 @@
/* Name of default certificate authority container */
#define DF_CA_CONTAINER "CAContainer"
-#else
#endif /* ENABLE_WINDOWS_LIBRESSL */
#if !defined(ENABLE_WINDOWS_LIBRESSL) || !defined(W32BITSBUILD)
diff --git a/pith/conf.c b/pith/conf.c
index d7ec5dbb..3bd564bd 100644
--- a/pith/conf.c
+++ b/pith/conf.c
@@ -1733,10 +1733,10 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **))
GLO_WP_INDEXHEIGHT = cpystr("24");
GLO_WP_AGGSTATE = cpystr("1");
GLO_WP_STATE = cpystr("");
-#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD))
+#ifdef DEFAULT_SSLCAPATH
GLO_SSLCAPATH = parse_list(DEFAULT_SSLCAPATH, 1,
PL_REMSURRQUOT, NULL);
-#endif
+#endif /* DEFAULT_SSLCAPATH */
#ifdef DF_VAR_SPELLER
GLO_SPELLER = cpystr(DF_VAR_SPELLER);
#endif
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 66a4e970..73c3c22b 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 398 2020-01-26 02:34:38
+Alpine Commit 400 2020-01-29 22:42:21
============= h_news =================
<HTML>
<HEAD>