Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-8]: src/external/bsd/bind/dist/lib/isc/unix Pull up following rev...



details:   https://anonhg.NetBSD.org/src/rev/c9ae3bed46e1
branches:  netbsd-8
changeset: 851931:c9ae3bed46e1
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 13 12:05:25 2018 +0000

description:
Pull up following revision(s) (requested by christos in ticket #972):

        external/bsd/bind/dist/lib/isc/unix/socket.c: revision 1.23

make ENOBUFS a soft error (from roy@)

diffstat:

 external/bsd/bind/dist/lib/isc/unix/socket.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 48a4b74e2aab -r c9ae3bed46e1 external/bsd/bind/dist/lib/isc/unix/socket.c
--- a/external/bsd/bind/dist/lib/isc/unix/socket.c      Mon Aug 13 12:03:41 2018 +0000
+++ b/external/bsd/bind/dist/lib/isc/unix/socket.c      Mon Aug 13 12:05:25 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: socket.c,v 1.20.6.1 2017/06/21 18:03:47 snj Exp $      */
+/*     $NetBSD: socket.c,v 1.20.6.2 2018/08/13 12:05:25 martin Exp $   */
 
 /*
  * Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
@@ -257,6 +257,7 @@
 #define SOFT_ERROR(e)  ((e) == EAGAIN || \
                         (e) == EWOULDBLOCK || \
                         (e) == EINTR || \
+                        (e) == ENOBUFS || \
                         (e) == 0)
 
 #define DLVL(x) ISC_LOGCATEGORY_GENERAL, ISC_LOGMODULE_SOCKET, ISC_LOG_DEBUG(x)
@@ -1916,7 +1917,7 @@
                SOFT_OR_HARD(EHOSTDOWN, ISC_R_HOSTDOWN);
                /* HPUX 11.11 can return EADDRNOTAVAIL. */
                SOFT_OR_HARD(EADDRNOTAVAIL, ISC_R_ADDRNOTAVAIL);
-               ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+               SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
                /* Should never get this one but it was seen. */
 #ifdef ENOPROTOOPT
                SOFT_OR_HARD(ENOPROTOOPT, ISC_R_HOSTUNREACH);
@@ -2112,7 +2113,7 @@
                ALWAYS_HARD(EHOSTDOWN, ISC_R_HOSTUNREACH);
 #endif
                ALWAYS_HARD(ENETUNREACH, ISC_R_NETUNREACH);
-               ALWAYS_HARD(ENOBUFS, ISC_R_NORESOURCES);
+               SOFT_OR_HARD(ENOBUFS, ISC_R_NORESOURCES);
                ALWAYS_HARD(EPERM, ISC_R_HOSTUNREACH);
                ALWAYS_HARD(EPIPE, ISC_R_NOTCONNECTED);
                ALWAYS_HARD(ECONNRESET, ISC_R_CONNECTIONRESET);



Home | Main Index | Thread Index | Old Index