Bug#691908: unblock: cyrus-sasl2/2.1.25.dfsg1-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package cyrus-sasl2
The update pulls an upstream patch to fix auth failures when there is
a problem with hostname.
Diffstat:
changelog | 6 +++
patches/0037-abort_if_no_fqdn_fix.patch | 59 ++++++++++++++++++++++++++++++++
patches/series | 1
3 files changed, 66 insertions(+)
unblock cyrus-sasl2/2.1.25.dfsg1-6
-- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru cyrus-sasl2-2.1.25.dfsg1/debian/changelog cyrus-sasl2-2.1.25.dfsg1/debian/changelog
--- cyrus-sasl2-2.1.25.dfsg1/debian/changelog 2012-08-06 13:35:13.000000000 +0200
+++ cyrus-sasl2-2.1.25.dfsg1/debian/changelog 2012-10-26 14:06:17.000000000 +0200
@@ -1,3 +1,9 @@
+cyrus-sasl2 (2.1.25.dfsg1-6) unstable; urgency=low
+
+ * Fix failures when the host have broken hostname (Closes: #683555)
+
+ -- Ondřej Surý <ondrej@debian.org> Fri, 26 Oct 2012 14:06:11 +0200
+
cyrus-sasl2 (2.1.25.dfsg1-5) unstable; urgency=low
* New sourceful upload (Closes: #676914)
diff -Nru cyrus-sasl2-2.1.25.dfsg1/debian/patches/0037-abort_if_no_fqdn_fix.patch cyrus-sasl2-2.1.25.dfsg1/debian/patches/0037-abort_if_no_fqdn_fix.patch
--- cyrus-sasl2-2.1.25.dfsg1/debian/patches/0037-abort_if_no_fqdn_fix.patch 1970-01-01 01:00:00.000000000 +0100
+++ cyrus-sasl2-2.1.25.dfsg1/debian/patches/0037-abort_if_no_fqdn_fix.patch 2012-10-26 14:06:17.000000000 +0200
@@ -0,0 +1,59 @@
+--- a/lib/saslutil.c
++++ b/lib/saslutil.c
+@@ -555,32 +555,44 @@ int get_fqhostname(
+ NULL, /* don't care abour service/port */
+ &hints,
+ &result) != 0) {
+- /* errno on Unix, WSASetLastError on Windows are already done by the function */
+- return (-1);
++ if (abort_if_no_fqdn) {
++ /* errno on Unix, WSASetLastError on Windows are already done by the function */
++ return (-1);
++ } else {
++ goto LOWERCASE;
++ }
+ }
+
+- if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
++ if (result == NULL || result->ai_canonname == NULL) {
+ freeaddrinfo (result);
++ if (abort_if_no_fqdn) {
+ #ifdef WIN32
+- WSASetLastError (WSANO_DATA);
++ WSASetLastError (WSANO_DATA);
+ #elif defined(ENODATA)
+- errno = ENODATA;
++ errno = ENODATA;
+ #elif defined(EADDRNOTAVAIL)
+- errno = EADDRNOTAVAIL;
++ errno = EADDRNOTAVAIL;
+ #endif
+- return (-1);
++ return (-1);
++ } else {
++ goto LOWERCASE;
++ }
+ }
+
+- if (abort_if_no_fqdn && strchr (result->ai_canonname, '.') == NULL) {
++ if (strchr (result->ai_canonname, '.') == NULL) {
+ freeaddrinfo (result);
++ if (abort_if_no_fqdn) {
+ #ifdef WIN32
+- WSASetLastError (WSANO_DATA);
++ WSASetLastError (WSANO_DATA);
+ #elif defined(ENODATA)
+- errno = ENODATA;
++ errno = ENODATA;
+ #elif defined(EADDRNOTAVAIL)
+- errno = EADDRNOTAVAIL;
++ errno = EADDRNOTAVAIL;
+ #endif
+- return (-1);
++ return (-1);
++ } else {
++ goto LOWERCASE;
++ }
+ }
+
+
diff -Nru cyrus-sasl2-2.1.25.dfsg1/debian/patches/series cyrus-sasl2-2.1.25.dfsg1/debian/patches/series
--- cyrus-sasl2-2.1.25.dfsg1/debian/patches/series 2012-08-06 13:35:13.000000000 +0200
+++ cyrus-sasl2-2.1.25.dfsg1/debian/patches/series 2012-10-26 14:06:17.000000000 +0200
@@ -21,3 +21,4 @@
0034-fix_dovecot_authentication.patch
0035-temporary_multiarch_fixes.patch
0036-add-reference-to-LDAP_SASLAUTHD-file.patch
+0037-abort_if_no_fqdn_fix.patch
Reply to: