Hello community,
here is the log from the commit of package msmtp for openSUSE:Factory checked
in at 2016-01-08 15:23:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/msmtp (Old)
and /work/SRC/openSUSE:Factory/.msmtp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "msmtp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/msmtp/msmtp.changes 2015-05-26
12:35:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.msmtp.new/msmtp.changes 2016-01-08
15:23:25.000000000 +0100
@@ -1,0 +2,10 @@
+Sun Nov 29 13:12:48 UTC 2015 - benoit.mo...@gmx.fr
+
+- update to version 1.6.3:
+ * A bug in SOCKS support was fixed.
+ * Handling non-fatal errors in TLS handshakes was fixed.
+- fix info installation for suse package:
+ * properly requires %install_info_prereq
+ * call %install_info_delete in preun, not postun
+
+-------------------------------------------------------------------
Old:
----
msmtp-1.6.2.tar.xz
msmtp-1.6.2.tar.xz.sig
New:
----
msmtp-1.6.3.tar.xz
msmtp-1.6.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ msmtp.spec ++++++
--- /var/tmp/diff_new_pack.ETImGU/_old 2016-01-08 15:23:26.000000000 +0100
+++ /var/tmp/diff_new_pack.ETImGU/_new 2016-01-08 15:23:26.000000000 +0100
@@ -19,7 +19,7 @@
%bcond_with gnome_keyring
Name: msmtp
-Version: 1.6.2
+Version: 1.6.3
Release: 0
BuildRequires: libidn-devel
BuildRequires: openssl-devel
@@ -47,7 +47,8 @@
%endif #suse_version
%endif #centos_version
%if 0%{?suse_version}
-PreReq: %install_info_prereq
+Requires(post): %install_info_prereq
+Requires(preun): %install_info_prereq
%endif
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
Requires(post): /sbin/install-info
@@ -165,7 +166,7 @@
%post
%install_info --info-dir=%{_infodir} %{_infodir}/msmtp.info%{ext_info}
-%postun
+%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/msmtp.info%{ext_info}
%endif
%if 0%{?fedora} || 0%{?rhel_version} || 0%{?centos_version}
++++++ msmtp-1.6.2.tar.xz -> msmtp-1.6.3.tar.xz ++++++
++++ 2668 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/ChangeLog new/msmtp-1.6.3/ChangeLog
--- old/msmtp-1.6.2/ChangeLog 2015-04-24 19:12:55.000000000 +0200
+++ new/msmtp-1.6.3/ChangeLog 2015-11-27 21:44:54.000000000 +0100
@@ -1,3 +1,75 @@
+commit ea7e0de2776e141b937e258efaa6a7f4001bd5e6
+Author: Martin Lambers <mar...@marlam.de>
+Date: 2015-11-27 21:42:56 +0100
+
+ Bump version to 1.6.3.
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a7b5ec9ce85c77c47cd28891210f6d87f82f9d90
+Author: Martin Lambers <mar...@marlam.de>
+Date: 2015-11-27 21:42:10 +0100
+
+ Update NEWS.
+
+ NEWS | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 091b31fffdf4dc18f24d2cf938188c6df5265f73
+Author: Martin Lambers <mar...@marlam.de>
+Date: 2015-11-02 10:32:38 +0100
+
+ SOCKS5: do not clobber the status byte reported by the server.
+
+ This prevented SOCKS support from working in certain cases.
+ Analyzed and reported by Russ Dill. Thanks!
+
+ src/net.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit bb27fd6582231acee23759341864405e45db8a2f
+Author: Martin Lambers <mar...@marlam.de>
+Date: 2015-09-07 22:34:22 +0200
+
+ Remove erroneous cast.
+
+ The cast was wrong and resulted in warnings from smart compilers. Reported
and
+ fix suggested by Stefan Krüger. Thanks!
+
+ Note that the code accidentally worked on most machines with two-complement
+ integers and common compilers: casting -1 to size_t results in the largest
+ representable size_t, then adding +1 usually wraps around to zero, which
is the
+ intended result.
+
+ src/conf.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 38f9a2e89df2941c0dd947cdd001c309a4d378d9
+Author: Emmanuel Bouthenot <kol...@openics.org>
+Date: 2015-06-04 10:25:47 +0200
+
+ Fix various issues in manpage (spelling and formating errors)
+
+ doc/msmtp.1 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 7f952bf19cef450b3d84971e96798742de5c7b60
+Author: Emmanuel Bouthenot <kol...@openics.org>
+Date: 2015-05-20 19:48:16 +0200
+
+ Fix handling of non-fatal errors in gnutls_handshake().
+
+ The fix consists in recalling gnutls_handshake() for ever until the error
+ returned is fatal (that's what the doc says[1] and that's how gnutls-cli is
+ implemented[2]).
+
+ [1] http://www.gnutls.org/manual/html_node/TLS-handshake.html
+ [2] https://gitlab.com/gnutls/gnutls/blob/master/src/cli.c#L1620
+
+ src/tls.c | 26 +++++++++-----------------
+ 1 file changed, 9 insertions(+), 17 deletions(-)
+
commit 164d1d0a27c888c4424e79862ae72da06b946606
Author: Martin Lambers <mar...@marlam.de>
Date: 2015-04-24 19:11:59 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/NEWS new/msmtp-1.6.3/NEWS
--- old/msmtp-1.6.2/NEWS 2015-04-24 19:10:07.000000000 +0200
+++ new/msmtp-1.6.3/NEWS 2015-11-27 21:42:07.000000000 +0100
@@ -1,3 +1,7 @@
+Version 1.6.3:
+- A bug in SOCKS support was fixed.
+- Handling non-fatal errors in TLS handshakes was fixed.
+
Version 1.6.2:
- A bug was fixed that prevented consecutive Bcc headers from being removed
properly.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/build-aux/compile new/msmtp-1.6.3/build-aux/compile
--- old/msmtp-1.6.2/build-aux/compile 2015-04-24 19:10:46.000000000 +0200
+++ new/msmtp-1.6.3/build-aux/compile 2015-11-27 21:43:59.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/build-aux/mdate-sh new/msmtp-1.6.3/build-aux/mdate-sh
--- old/msmtp-1.6.2/build-aux/mdate-sh 2015-04-24 19:10:47.000000000 +0200
+++ new/msmtp-1.6.3/build-aux/mdate-sh 2015-11-27 21:43:59.000000000 +0100
@@ -1,9 +1,9 @@
#!/bin/sh
# Get modification time of a file or directory and pretty-print it.
-scriptversion=2010-08-21.06; # UTC
+scriptversion=2015-04-09.19; # UTC
-# Copyright (C) 1995-2013 Free Software Foundation, Inc.
+# Copyright (C) 1995-2014 Free Software Foundation, Inc.
# written by Ulrich Drepper <drep...@gnu.ai.mit.edu>, June 1995
#
# This program is free software; you can redistribute it and/or modify
@@ -74,6 +74,10 @@
LC_TIME=C
export LC_TIME
+# Use UTC to get reproducible result
+TZ=UTC
+export TZ
+
# GNU ls changes its time format in response to the TIME_STYLE
# variable. Since we cannot assume 'unset' works, revert this
# variable to its documented default.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/build-aux/missing new/msmtp-1.6.3/build-aux/missing
--- old/msmtp-1.6.2/build-aux/missing 2015-04-24 19:10:46.000000000 +0200
+++ new/msmtp-1.6.3/build-aux/missing 2015-11-27 21:43:59.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/configure.ac new/msmtp-1.6.3/configure.ac
--- old/msmtp-1.6.2/configure.ac 2015-04-24 19:10:33.000000000 +0200
+++ new/msmtp-1.6.3/configure.ac 2015-11-27 21:42:43.000000000 +0100
@@ -24,7 +24,7 @@
#
dnl Autotools init stuff
-AC_INIT([msmtp], [1.6.2], [mar...@marlam.de], [msmtp],
[http://msmtp.sourceforge.net/])
+AC_INIT([msmtp], [1.6.3], [mar...@marlam.de], [msmtp],
[http://msmtp.sourceforge.net/])
AC_CONFIG_SRCDIR([src/msmtp.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/doc/msmtp.1 new/msmtp-1.6.3/doc/msmtp.1
--- old/msmtp-1.6.2/doc/msmtp.1 2015-01-04 12:21:43.000000000 +0100
+++ new/msmtp-1.6.3/doc/msmtp.1 2015-06-04 10:25:00.000000000 +0200
@@ -170,7 +170,7 @@
Set or unset an aliases file. See the \fBaliases\fP command.
.IP "\-F\fIname\fP"
Msmtp adds a From header to mails that lack it, using the envelope from
-address. This option allows to set a full name to be used in that header.
+address. This option allows one to set a full name to be used in that header.
.IP "\-\-"
This marks the end of options. All following arguments will be treated as
recipient addresses, even if they start with a `\-'.
@@ -637,7 +637,7 @@
.br
# $ msmtp \-\-serverinfo \-\-tls \-\-tls\-certcheck=off
\-\-host=smtp.freemail.example
.br
-tls_fingerprint 00:11:22:33:44:55:66:77:88:99:AA:BB:CC:DD:EE:FF:00:11:22:33
+tls_fingerprint
00\::11\::22\::33\::44\::55\::66\::77\::88\::99\::AA\::BB\::CC\::DD\::EE\::FF\::00\::11\::22\::33
.br
.br
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/doc/msmtp.info new/msmtp-1.6.3/doc/msmtp.info
--- old/msmtp-1.6.2/doc/msmtp.info 2015-04-24 19:12:49.000000000 +0200
+++ new/msmtp-1.6.3/doc/msmtp.info 2015-11-27 21:44:50.000000000 +0100
@@ -1,6 +1,6 @@
-This is msmtp.info, produced by makeinfo version 5.2 from msmtp.texi.
+This is msmtp.info, produced by makeinfo version 6.0 from msmtp.texi.
-This manual was last updated 30 December 2014 for version 1.6.2 of
+This manual was last updated 30 December 2014 for version 1.6.3 of
msmtp.
Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
@@ -22,7 +22,7 @@
msmtp
*****
-This manual was last updated 30 December 2014 for version 1.6.2 of
+This manual was last updated 30 December 2014 for version 1.6.3 of
msmtp.
Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/doc/stamp-vti new/msmtp-1.6.3/doc/stamp-vti
--- old/msmtp-1.6.2/doc/stamp-vti 2015-04-24 19:12:47.000000000 +0200
+++ new/msmtp-1.6.3/doc/stamp-vti 2015-11-27 21:44:48.000000000 +0100
@@ -1,4 +1,4 @@
@set UPDATED 30 December 2014
@set UPDATED-MONTH December 2014
-@set EDITION 1.6.2
-@set VERSION 1.6.2
+@set EDITION 1.6.3
+@set VERSION 1.6.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/doc/version.texi new/msmtp-1.6.3/doc/version.texi
--- old/msmtp-1.6.2/doc/version.texi 2015-04-24 19:12:47.000000000 +0200
+++ new/msmtp-1.6.3/doc/version.texi 2015-11-27 21:44:48.000000000 +0100
@@ -1,4 +1,4 @@
@set UPDATED 30 December 2014
@set UPDATED-MONTH December 2014
-@set EDITION 1.6.2
-@set VERSION 1.6.2
+@set EDITION 1.6.3
+@set VERSION 1.6.3
Files old/msmtp-1.6.2/po/de.gmo and new/msmtp-1.6.3/po/de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/po/de.po new/msmtp-1.6.3/po/de.po
--- old/msmtp-1.6.2/po/de.po 2015-04-24 19:12:55.000000000 +0200
+++ new/msmtp-1.6.3/po/de.po 2015-11-27 21:44:54.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: msmtp 1.4.31\n"
"Report-Msgid-Bugs-To: mar...@marlam.de\n"
-"POT-Creation-Date: 2015-04-24 19:12+0200\n"
+"POT-Creation-Date: 2015-11-27 21:44+0100\n"
"PO-Revision-Date: 2013-04-22 19:10+0200\n"
"Last-Translator: Martin Lambers <mar...@marlam.de>\n"
"Language-Team: German\n"
@@ -987,8 +987,7 @@
msgstr "nicht genug Speicher"
#: src/net.c:83 src/net.c:194 src/net.c:241 src/net.c:642 src/net.c:746
-#: src/tls.c:1363 src/tls.c:1421 src/tls.c:1478 src/tls.c:1528 src/tls.c:1610
-#: src/tls.c:1656
+#: src/tls.c:1413 src/tls.c:1470 src/tls.c:1520 src/tls.c:1602 src/tls.c:1648
#, c-format
msgid "operation aborted"
msgstr "Operation abgebrochen"
@@ -1097,7 +1096,7 @@
msgid "invalid request"
msgstr "ungültige Anfrage"
-#: src/net.c:164 src/net.c:566 src/tls.c:1314 src/tls.c:1338 src/tls.c:1633
+#: src/net.c:164 src/net.c:566 src/tls.c:1314 src/tls.c:1338 src/tls.c:1625
msgid "unknown error"
msgstr "unbekannter Fehler"
@@ -1107,7 +1106,7 @@
msgstr "Netzwerk Lesefehler: %s"
#: src/net.c:184 src/net.c:199 src/net.c:231 src/net.c:246 src/tls.c:1333
-#: src/tls.c:1370 src/tls.c:1485 src/tls.c:1617
+#: src/tls.c:1477 src/tls.c:1609
msgid "the operation timed out"
msgstr "die Wartezeit ist abgelaufen"
@@ -1560,35 +1559,35 @@
msgid "the connection was closed unexpectedly"
msgstr "die Verbindung wurde unerwartet getrennt"
-#: src/tls.c:1369 src/tls.c:1374
+#: src/tls.c:1367
#, c-format
msgid "TLS handshake failed: %s"
msgstr "TLS Aushandlung fehlgeschlagen: %s"
-#: src/tls.c:1408
+#: src/tls.c:1400
#, c-format
msgid "cannot set the file descriptor for TLS: %s"
msgstr "kann Dateideskriptor für TLS nicht setzen: %s"
-#: src/tls.c:1427
+#: src/tls.c:1419
msgid "TLS handshake failed"
msgstr "TLS Aushandlung fehlgeschlagen"
-#: src/tls.c:1484 src/tls.c:1489
+#: src/tls.c:1476 src/tls.c:1481
#, c-format
msgid "cannot read from TLS connection: %s"
msgstr "Lesefehler in TLS Verbindung: %s"
-#: src/tls.c:1533
+#: src/tls.c:1525
msgid "cannot read from TLS connection"
msgstr "Lesefehler in TLS Verbindung"
-#: src/tls.c:1616 src/tls.c:1621 src/tls.c:1632
+#: src/tls.c:1608 src/tls.c:1613 src/tls.c:1624
#, c-format
msgid "cannot write to TLS connection: %s"
msgstr "Schreibfehler in TLS Verbindung: %s"
-#: src/tls.c:1662
+#: src/tls.c:1654
msgid "cannot write to TLS connection"
msgstr "Schreibfehler in TLS Verbindung"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/src/conf.c new/msmtp-1.6.3/src/conf.c
--- old/msmtp-1.6.2/src/conf.c 2015-01-03 08:05:16.000000000 +0100
+++ new/msmtp-1.6.3/src/conf.c 2015-09-07 22:34:08.000000000 +0200
@@ -873,13 +873,13 @@
if (l >= 1 && s[i] == '"' && s[i + l] == '"')
{
t = xmalloc(l * sizeof(char));
- strncpy(t, s + i + 1, (size_t)l - 1);
+ strncpy(t, s + i + 1, l - 1);
t[l - 1] = '\0';
}
else
{
t = xmalloc((l + 2) * sizeof(char));
- strncpy(t, s + i, (size_t)l + 1);
+ strncpy(t, s + i, l + 1);
t[l + 1] = '\0';
}
return t;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/src/net.c new/msmtp-1.6.3/src/net.c
--- old/msmtp-1.6.2/src/net.c 2015-01-02 21:32:12.000000000 +0100
+++ new/msmtp-1.6.3/src/net.c 2015-11-02 10:29:43.000000000 +0100
@@ -524,7 +524,7 @@
len = buffer[4];
}
len += 2; /* port number */
- if ((ret = net_recv(fd, buffer, len, errstr)) < 0)
+ if ((ret = net_recv(fd, buffer + 5, len, errstr)) < 0)
{
return NET_EIO;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/msmtp-1.6.2/src/tls.c new/msmtp-1.6.3/src/tls.c
--- old/msmtp-1.6.2/src/tls.c 2014-11-25 20:26:33.000000000 +0100
+++ new/msmtp-1.6.3/src/tls.c 2015-05-20 19:50:31.000000000 +0200
@@ -1356,24 +1356,16 @@
int error_code;
gnutls_transport_set_ptr(tls->session, (gnutls_transport_ptr_t)fd);
- if ((error_code = gnutls_handshake(tls->session)) < 0)
+ do
{
- if (error_code == GNUTLS_E_INTERRUPTED)
- {
- *errstr = xasprintf(_("operation aborted"));
- }
- else if (error_code == GNUTLS_E_AGAIN)
- {
- /* This error message makes more sense than what
- * gnutls_strerror() would return. */
- *errstr = xasprintf(_("TLS handshake failed: %s"),
- _("the operation timed out"));
- }
- else
- {
- *errstr = xasprintf(_("TLS handshake failed: %s"),
- gnutls_strerror(error_code));
- }
+ error_code = gnutls_handshake(tls->session);
+ }
+ while (error_code < 0 && gnutls_error_is_fatal(error_code) == 0);
+
+ if (error_code != 0)
+ {
+ *errstr = xasprintf(_("TLS handshake failed: %s"),
+ gnutls_strerror(error_code));
gnutls_deinit(tls->session);
gnutls_certificate_free_credentials(tls->cred);
return TLS_EHANDSHAKE;
