diff options
Diffstat (limited to 'pith')
| -rw-r--r-- | pith/conf.c | 10 | ||||
| -rw-r--r-- | pith/conf.h | 4 | ||||
| -rw-r--r-- | pith/conftype.h | 2 | ||||
| -rw-r--r-- | pith/pine.hlp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/pith/conf.c b/pith/conf.c index c39a19eb..dedeb1be 100644 --- a/pith/conf.c +++ b/pith/conf.c @@ -377,7 +377,7 @@ CONF_TXT_T cf_text_mailcap_path[] = "Sets the search path for the mailcap config CONF_TXT_T cf_text_mimetype_path[] = "Sets the search path for the mimetypes configuration file.\n# NOTE: colon delimited under UNIX, semi-colon delimited under DOS/Windows/OS2."; -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) CONF_TXT_T cf_text_system_certs_path[] = "Sets the path for the system ssl certificates issued by a trusted\n# certificate authority. Note that this could be a list of paths, if the same\n# pinerc is used in different systems. Alpine always chooses the first one that\n# it finds. Value must be an absolute path."; CONF_TXT_T cf_text_system_certs_file[] = "Sets the path for the system ssl file container of certificates issued by a\n# certificate authority. Note that this could be a list of container files,\n# if the same pinerc is used in different systems. Alpine always chooses the,\n# first one that it finds. Value must be an absolute path."; @@ -667,7 +667,7 @@ static struct variable variables[] = { NULL, cf_text_mailcap_path}, {"mimetype-search-path", 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, NULL, cf_text_mimetype_path}, -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) {"system-certs-path", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, "System CACerts Dir", cf_text_system_certs_path}, {"system-certs-file", 0, 1, 0, 1, 1, 1, 0, 0, 0, 0, 0, @@ -2388,7 +2388,7 @@ init_vars(struct pine *ps, void (*cmds_f) (struct pine *, char **)) set_current_val(&vars[V_DOWNLOAD_CMD_PREFIX], TRUE, TRUE); set_current_val(&vars[V_MAILCAP_PATH], TRUE, TRUE); set_current_val(&vars[V_MIMETYPE_PATH], TRUE, TRUE); -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) set_current_val(&vars[V_SSLCAPATH], TRUE, TRUE); set_current_val(&vars[V_SSLCAFILE], TRUE, TRUE); #endif @@ -7076,7 +7076,7 @@ feature_gets_an_x(struct pine *ps, struct variable *var, FEATURE_S *feature, test_old_growth_bits(ps, feature->id))))); } -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) void set_system_certs_path(struct pine *ps) { @@ -7967,7 +7967,7 @@ config_help(int var, int feature) return(h_config_mailcap_path); case V_MIMETYPE_PATH : return(h_config_mimetype_path); -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) case V_SSLCAPATH : return(h_config_system_certs_path); case V_SSLCAFILE : diff --git a/pith/conf.h b/pith/conf.h index ac6f0a8f..1ed1f90b 100644 --- a/pith/conf.h +++ b/pith/conf.h @@ -133,7 +133,7 @@ #define VAR_COLOR_STYLE vars[V_COLOR_STYLE].current_val.p #define GLO_COLOR_STYLE vars[V_COLOR_STYLE].global_val.p #endif -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) #define VAR_SSLCAPATH vars[V_SSLCAPATH].current_val.l #define GLO_SSLCAPATH vars[V_SSLCAPATH].global_val.l #define VAR_SSLCAFILE vars[V_SSLCAFILE].current_val.l @@ -922,7 +922,7 @@ char **get_supported_options(void); unsigned reset_startup_rule(MAILSTREAM *); void free_pinerc_lines(PINERC_LINE **); void panic1(char *, char *); -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) void set_system_certs_path(struct pine *); void set_system_certs_container(struct pine *); #endif diff --git a/pith/conftype.h b/pith/conftype.h index 029b81bc..ca316189 100644 --- a/pith/conftype.h +++ b/pith/conftype.h @@ -125,7 +125,7 @@ typedef enum { V_PERSONAL_NAME = 0 , V_DOWNLOAD_CMD_PREFIX , V_MAILCAP_PATH , V_MIMETYPE_PATH -#if !defined(_WINDOWS) || (defined(ENABLE_WINDOWS_LIBRESSL) && defined(W32BITSBUILD)) +#if !defined(_WINDOWS) || defined(WINDOWS_LIBRESSL_CERTS) , V_SSLCAPATH , V_SSLCAFILE #endif diff --git a/pith/pine.hlp b/pith/pine.hlp index 2a73d944..fa22dd9b 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 404 2020-02-06 15:41:28 +Alpine Commit 407 2020-02-09 22:46:28 ============= h_news ================= <HTML> <HEAD> |