Module Name: src
Committed By: martin
Date: Thu Dec 14 17:24:42 UTC 2023
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix [netbsd-10]:
mDNSPosix.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #493):
external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c: revision 1.20
mDNSPlatformInit(): If we fail to create an IPv6 socket, ignore the
error and just continue without IPv6 support.
PR bin/57769
To generate a diff of this commit:
cvs rdiff -u -r1.17.6.1 -r1.17.6.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.17.6.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.17.6.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.17.6.1 Wed Sep 13 09:46:49 2023
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c Thu Dec 14 17:24:42 2023
@@ -1324,7 +1324,16 @@ mDNSexport mStatus mDNSPlatformInit(mDNS
#if HAVE_IPV6
sa.sa_family = AF_INET6;
m->p->unicastSocket6 = -1;
- if (err == mStatus_NoError) err = SetupSocket(&sa, zeroIPPort, 0, &m->p->unicastSocket6);
+ if (err == mStatus_NoError)
+ {
+ err = SetupSocket(&sa, zeroIPPort, 0, &m->p->unicastSocket6);
+ if (err != mStatus_NoError)
+ {
+ // Ignore errors configuring IPv6.
+ m->p->unicastSocket6 = -1;
+ err = mStatus_NoError;
+ }
+ }
#endif
// Tell mDNS core about the network interfaces on this machine.
