summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alpine/adrbkcmd.c8
-rw-r--r--alpine/alpine.c2
-rwxr-xr-xconfigure10
-rw-r--r--configure.ac10
-rw-r--r--imap/src/osdep/unix/ssl_unix.c4
-rw-r--r--pith/pine.hlp4
-rw-r--r--pith/smime.c2
7 files changed, 22 insertions, 18 deletions
diff --git a/alpine/adrbkcmd.c b/alpine/adrbkcmd.c
index b7302a16..36244b3b 100644
--- a/alpine/adrbkcmd.c
+++ b/alpine/adrbkcmd.c
@@ -7592,6 +7592,9 @@ url_local_ldap(char *url)
we_cancel = busy_cue(_("Searching for LDAP url"), NULL, 0);
ps_global->mangled_footer = 1;
+#ifdef _SOLARIS_SDK
+ if((ld = ldap_init(ldapurl->lud_host, ldapurl->lud_port)) == NULL)
+#else
#if (LDAPAPI >= 11)
#ifdef _WINDOWS
if((ld = ldap_init(ldapurl->lud_host, ldapurl->lud_port)) == NULL)
@@ -7599,10 +7602,11 @@ url_local_ldap(char *url)
snprintf(tmp_20k_buf, SIZEOF_20KBUF, "ldap://%s:%d", ldapurl->lud_host, ldapurl->lud_port);
tmp_20k_buf[SIZEOF_20KBUF-1] = '\0';
if(ldap_initialize(&ld, tmp_20k_buf) != LDAP_SUCCESS)
-#endif
+#endif /* _WINDOWS */
#else
if((ld = ldap_open(ldapurl->lud_host, ldapurl->lud_port)) == NULL)
-#endif
+#endif /* LDAPAPI >= 11 */
+#endif /* _SOLARIS_SDK */
{
if(we_cancel){
cancel_busy_cue(-1);
diff --git a/alpine/alpine.c b/alpine/alpine.c
index e0a914ae..3b7df35f 100644
--- a/alpine/alpine.c
+++ b/alpine/alpine.c
@@ -707,7 +707,7 @@ main(int argc, char **argv)
if(max_v > 0 && max_v < (long) pith_ssl_encryption_version("tls1")){
snprintf(tmp_20k_buf, SIZEOF_20KBUF,
_("Security alert: SSL maximum encryption version was set to SSLv3."),
- ps_global->VAR_ENCRYPTION_RANGE);
+ ps_global->VAR_ENCRYPTION_RANGE);
tmp_20k_buf[SIZEOF_20KBUF-1] = '\0';
init_error(ps_global, SM_ORDER | SM_DING, 3, 5, tmp_20k_buf);
}
diff --git a/configure b/configure
index 0f34f07b..e223b0eb 100755
--- a/configure
+++ b/configure
@@ -18376,8 +18376,8 @@ else
case $host in
*-*-freebsd*)
alpine_LDAPDIR="/usr/local"
- alpine_LDAPINCLUDE="${LDAPDIR}/include"
- alpine_LDAPLIB="${LDAPDIR}/lib"
+ alpine_LDAPINCLUDE="${alpine_LDAPDIR}/include"
+ alpine_LDAPLIB="${alpine_LDAPDIR}/lib"
;;
esac;
@@ -18389,8 +18389,8 @@ if test "${with_ldap_dir+set}" = set; then :
withval=$with_ldap_dir;
if test "x$withval" != "xno" ; then
alpine_LDAPDIR="${withval}"
- alpine_LDAPINCLUDE="${LDAPDIR}/include"
- alpine_LDAPLIB="${LDAPDIR}/lib"
+ alpine_LDAPINCLUDE="${alpine_LDAPDIR}/include"
+ alpine_LDAPLIB="${alpine_LDAPDIR}/lib"
fi
fi
@@ -19591,7 +19591,7 @@ else
alpine_SSLTYPE="none"
fi
- if test "x$alpine_SSLTYPE" = "xnone" ; then
+ if test "x$aalpiLlpine_SSLTYPE" = "xnone" ; then
as_fn_error $? "No library containing OPENSSL_init_ssl found in your path" "$LINENO" 5
exit 1
fi
diff --git a/configure.ac b/configure.ac
index 0a67d012..2ef125c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1067,8 +1067,8 @@ else
case $host in
*-*-freebsd*)
alpine_LDAPDIR="/usr/local"
- alpine_LDAPINCLUDE="${LDAPDIR}/include"
- alpine_LDAPLIB="${LDAPDIR}/lib"
+ alpine_LDAPINCLUDE="${alpine_LDAPDIR}/include"
+ alpine_LDAPLIB="${alpine_LDAPDIR}/lib"
;;
esac;
@@ -1079,8 +1079,8 @@ else
[
if test "x$withval" != "xno" ; then
alpine_LDAPDIR="${withval}"
- alpine_LDAPINCLUDE="${LDAPDIR}/include"
- alpine_LDAPLIB="${LDAPDIR}/lib"
+ alpine_LDAPINCLUDE="${alpine_LDAPDIR}/include"
+ alpine_LDAPLIB="${alpine_LDAPDIR}/lib"
fi
])
@@ -1581,7 +1581,7 @@ if test "x$alpine_SSLTYPE" != "xnone" ; then
fi
else
AC_SEARCH_LIBS(OPENSSL_init_ssl,ssl,, [ alpine_SSLTYPE="none" ])
- if test "x$alpine_SSLTYPE" = "xnone" ; then
+ if test "x$aalpiLlpine_SSLTYPE" = "xnone" ; then
AC_MSG_ERROR(No library containing OPENSSL_init_ssl found in your path)
exit 1
fi
diff --git a/imap/src/osdep/unix/ssl_unix.c b/imap/src/osdep/unix/ssl_unix.c
index 05eabce3..53c5d05a 100644
--- a/imap/src/osdep/unix/ssl_unix.c
+++ b/imap/src/osdep/unix/ssl_unix.c
@@ -230,9 +230,9 @@ const SSL_METHOD *ssl_connect_mthd(int flag, int *min, int *max)
#ifdef TLS1_3_VERSION
: (flag & NET_TRYTLS1_3) ? TLS1_3_VERSION
#else
- : (flag & NET_TRYTLS1_3) ? INT_MAX
+ : (flag & NET_TRYTLS1_3) ? -2
#endif
- : 0L;
+ : 0;
*min = *(int *) mail_parameters(NULL, GET_ENCRYPTION_RANGE_MIN, NULL);
*max = *(int *) mail_parameters(NULL, GET_ENCRYPTION_RANGE_MAX, NULL);
diff --git a/pith/pine.hlp b/pith/pine.hlp
index fc0989e2..16efc9c2 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 334 2019-03-29 09:48:59
+Alpine Commit 335 2019-04-28 16:01:07
============= h_news =================
<HTML>
<HEAD>
@@ -301,7 +301,7 @@ Bugs that have been addressed include:
<LI> TLS 1.2 works does not work if Alpine is compiled with openssl &gt;= 1.1.0.
Reported and patched by Kyle George.
- <LI> If the directory where Alpine saves the certificates if empty,
+ <LI> If the directory where Alpine saves the certificates is empty,
alpine would not create a self-signed certificate to encrypt the
password file.
diff --git a/pith/smime.c b/pith/smime.c
index f64d81b2..de5996db 100644
--- a/pith/smime.c
+++ b/pith/smime.c
@@ -818,7 +818,7 @@ import_certificate(WhichCerts ctype, PERSONAL_CERT *p_cert, char *fname)
q_status_message(SM_ORDER, 1, 3, _("Error decrypting Password file"));
}
} else {
- q_status_message(SM_ORDER, 1, 3, _("Password file not encrypted and coulr not encrypt"));
+ q_status_message(SM_ORDER, 1, 3, _("Password file not encrypted and could not encrypt"));
rc = 0;
}
}