[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-328-g401abd1

[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=401abd106f77fbfbb166535951f1a29b8caf3775

The branch, master has been updated
       via  401abd106f77fbfbb166535951f1a29b8caf3775 (commit)
      from  67f4dba6e394b599a1958db8d5c414d401e43382 (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 401abd106f77fbfbb166535951f1a29b8caf3775
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Mar 20 19:47:01 2011 +0100

    use IP_DONTFRAG if it is defined.

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

Summary of changes:
 src/cli.c  |    4 +++-
 src/serv.c |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/cli.c b/src/cli.c
index 7ce2e6e..d5559c0 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -1437,15 +1437,17 @@ socket_open (socket_st * hd, const char *hostname, 
const char *service)
       exit (1);
     }
 
+#ifdef IP_DONTFRAG
   if (hints.ai_socktype == SOCK_DGRAM)
     {
       yes = 1;
-      if (setsockopt (sd, IPPROTO_IP, IP_DF,
+      if (setsockopt (sd, IPPROTO_IP, IP_DONTFRAG,
                           (const void *) &yes, sizeof (yes)) < 0)
         {
           perror ("setsockopt(IP_DF) failed");
         }
     }
+#endif
 
   hd->secure = 0;
   hd->fd = sd;
diff --git a/src/serv.c b/src/serv.c
index 9c868ea..633543c 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -729,15 +729,17 @@ listen_socket (const char *name, int listen_port, int 
socktype)
               continue;
             }
         }
+#ifdef IP_DONTFRAG
       else
         {
           yes = 1;
-          if (setsockopt (s, IPPROTO_IP, IP_DF,
+          if (setsockopt (s, IPPROTO_IP, IP_DONTFRAG,
                           (const void *) &yes, sizeof (yes)) < 0)
             {
               perror ("setsockopt(IP_DF) failed");
             }
         }
+#endif
       
       if (bind (s, ptr->ai_addr, ptr->ai_addrlen) < 0)
         {


hooks/post-receive
-- 
GNU gnutls