[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_22-15-g813f46e

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=813f46eb7afb73db5ced786ae3959855ffc56c25

The branch, gnutls_3_0_x-2 has been updated
       via  813f46eb7afb73db5ced786ae3959855ffc56c25 (commit)
      from  22c20072bb6013acf15c93fe3350abaf3f3b5661 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 813f46eb7afb73db5ced786ae3959855ffc56c25
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu Aug 30 19:46:06 2012 +0200

    On Linux with /proc/sys/net/ipv6/bindv6only == 0 (which is now the
    default), gnutls-serv cannot listen on ipv6. Patch by Bernhard R. Link.

-----------------------------------------------------------------------

Summary of changes:
 src/serv.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/serv.c b/src/serv.c
index 52fcdde..c7c104a 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -730,6 +730,17 @@ listen_socket (const char *name, int listen_port, int 
socktype)
           continue;
         }
 
+#ifdef HAVE_IPV6
+      if (ptr->ai_family == AF_INET6)
+        {
+          yes = 1;
+          /* avoid listen on ipv6 addresses failing
+          * because already listening on ipv4 addresses: */
+          setsockopt (s, IPPROTO_IPV6, IPV6_V6ONLY,
+                          (const void *) &yes, sizeof (yes));
+        }
+#endif
+
       if (socktype == SOCK_STREAM)
         {
           yes = 1;


hooks/post-receive
-- 
GNU gnutls