Fix GNU Hurd interface IPv6 address detection.

Define SIOCGIFCONF_GIVES_ADDR in OS/os.h-GNU

Fixes 1331.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index aa5adf1c8dc7d945c10192cda1961156d5a1233e..924b0b8e42ccfa642a111317b5cd989eb3d22e53 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -150,6 +150,10 @@ PP/14 Fix OCSP reinitialisation in SNI handling for Exim/TLS as server.
 
 JH/13 Add $router_name and $transport_name variables.  Bugzilla 308.
 
 
 JH/13 Add $router_name and $transport_name variables.  Bugzilla 308.
 

+PP/15 Define SIOCGIFCONF_GIVES_ADDR for GNU Hurd.
+      Bug detection, analysis and fix by Samuel Thibault.
+      Bugzilla 1331, Debian bug #698092.
+

 
 Exim version 4.80.1
 -------------------
 
 Exim version 4.80.1
 -------------------

diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 404920eab77483577ef824c9d8bbc28c188d9a2a..ed005b3f851fa8b717de96bbd32640e2a5d3521c 100644 (file)
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -440,6 +440,7 @@ Janne Snabb               TLS extensive debugging & failure root cause analysis
                           Added SPF record type support to dnsdb lookup
 Jan Srzednicki            Patch improving Dovecot authenticator
                           Reported crash in Dovecot authenticator
                           Added SPF record type support to dnsdb lookup
 Jan Srzednicki            Patch improving Dovecot authenticator
                           Reported crash in Dovecot authenticator

+Samuel Thibault           Patch fixing IPv6 interface address detection on Hurd

 Martin Tscholak           Reported issue with TLS anonymous ciphersuites
 Stephen Usher             Patch fixing use of Oracle's LDAP libraries on Solaris
 Holger Weiß               Patch leting ${run} return more data than OS pipe
 Martin Tscholak           Reported issue with TLS anonymous ciphersuites
 Stephen Usher             Patch fixing use of Oracle's LDAP libraries on Solaris
 Holger Weiß               Patch leting ${run} return more data than OS pipe

diff --git a/src/OS/os.Configuring b/src/OS/os.Configuring
index b5e4677d2df3f8dcc055d643e9ef33af10d45054..465bc2657473d1cfbc3977a7d5e052aad549fca5 100644 (file)
--- a/src/OS/os.Configuring
+++ b/src/OS/os.Configuring
@@ -88,7 +88,7 @@ On some operating systems, the SIOCGIFCONF ioctl returns the IP addresses
 with the list of interfaces, and there is no need to call SIOCGIFADDR for each
 individual address. Mostly, making the second call does no harm, but on Linux
 when there are IP aliases, it causes things to go wrong. This also happens on
 with the list of interfaces, and there is no need to call SIOCGIFADDR for each
 individual address. Mostly, making the second call does no harm, but on Linux
 when there are IP aliases, it causes things to go wrong. This also happens on

-BSDI. Therefore, there is now a macro to cut it out, called
+BSDI and GNU Hurd. Therefore, there is now a macro to cut it out, called

 SIOCGIFCONF_GIVES_ADDR.
 
 Note that, if IPv6 support is configured, Exim cannot find the IPv6 addresses
 SIOCGIFCONF_GIVES_ADDR.
 
 Note that, if IPv6 support is configured, Exim cannot find the IPv6 addresses

diff --git a/src/OS/os.h-GNU b/src/OS/os.h-GNU
index 0f8a8d63bcb9f9928ed73ed39c2836e910d61d13..cc4da0e3b76f5304d1ade874bad0b7840686b90e 100644 (file)
--- a/src/OS/os.h-GNU
+++ b/src/OS/os.h-GNU
@@ -2,11 +2,12 @@
 
 #define CRYPT_H
 #define GLIBC_IP_OPTIONS
 
 #define CRYPT_H
 #define GLIBC_IP_OPTIONS

-#define HAVE_MMAP

 #define HAVE_BSD_GETLOADAVG
 #define HAVE_BSD_GETLOADAVG

+#define HAVE_MMAP

 #define HAVE_SYS_VFS_H
 #define NO_IP_VAR_H
 #define SIG_IGN_WORKS
 #define HAVE_SYS_VFS_H
 #define NO_IP_VAR_H
 #define SIG_IGN_WORKS

+#define SIOCGIFCONF_GIVES_ADDR

 
 #define F_FREESP     O_TRUNC
 typedef struct flock flock_t;
 
 #define F_FREESP     O_TRUNC
 typedef struct flock flock_t;