diff options
| -rw-r--r-- | imap/configure.ac | 2 | ||||
| -rw-r--r-- | tcpd/libcouriertls.c | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/imap/configure.ac b/imap/configure.ac index 102adf0..dfddf43 100644 --- a/imap/configure.ac +++ b/imap/configure.ac @@ -4,7 +4,7 @@ dnl dnl Copyright 1998 - 2019 Double Precision, Inc. See COPYING for dnl distribution information. -AC_INIT(courier-imap, 5.0.9, [courier-users@lists.sourceforge.net]) +AC_INIT(courier-imap, 5.0.10, [courier-users@lists.sourceforge.net]) >confdefs.h # Kill PACKAGE_ macros diff --git a/tcpd/libcouriertls.c b/tcpd/libcouriertls.c index ac05caf..fa47ea8 100644 --- a/tcpd/libcouriertls.c +++ b/tcpd/libcouriertls.c @@ -251,7 +251,7 @@ static int verifypeer1(const struct tls_info *info, X509 *x, X509_NAME *subj=NULL; int nentries, j; char domain[256]; - char errmsg[1000]; +char errmsg[1000]; if(subject_alt_names) { @@ -1277,13 +1277,15 @@ SSL *tls_connect(SSL_CTX *ctx, int fd) } else { - char *idn_domain1; - - if (idna_to_unicode_8z8z(info->peer_verify_domain, - &idn_domain1, 0) - != IDNA_SUCCESS) - idn_domain1=0; + char *idn_domain1=0; + if (info->peer_verify_domain) + { + if (idna_to_unicode_8z8z(info->peer_verify_domain, + &idn_domain1, 0) + != IDNA_SUCCESS) + idn_domain1=0; + } SSL_set_connect_state(ssl); #ifdef HAVE_OPENSSL_SNI |