[src/trunk]: src/external/apache2/mDNSResponder/dist/mDNSShared Fix mdnsd "ER...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b6af97867fb5
branches:  trunk
changeset: 761975:b6af97867fb5
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Feb 12 17:21:38 2011 +0000

description:
Fix mdnsd "ERROR failed to get errsd via SCM_RIGHTS" problem. mdnsd +
nsswitch.conf "multicast_dns" works for me now on amd64.

diffstat:

 external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r bde331e5a1e4 -r b6af97867fb5 external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
--- a/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c       Sat Feb 12 17:15:27 2011 +0000
+++ b/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c       Sat Feb 12 17:21:38 2011 +0000
@@ -3596,12 +3596,15 @@
 #if !defined(_WIN32)
                cmsg = CMSG_FIRSTHDR(&msg);
 #if DEBUG_64BIT_SCM_RIGHTS
-               LogMsg("%3d: Expecting %d %d %d %d", req->sd, sizeof(cbuf),       sizeof(cbuf),   SOL_SOCKET,       SCM_RIGHTS);
-               LogMsg("%3d: Got       %d %d %d %d", req->sd, msg.msg_controllen, cmsg->cmsg_len, cmsg->cmsg_level, cmsg->cmsg_type);
+               LogMsg("%3d: Expecting %d %d %d %d", req->sd, sizeof(cbuf),       CMSG_LEN(sizeof(dnssd_sock_t)),   SOL_SOCKET,       SCM_RIGHTS);
+               if (cmsg)
+                       LogMsg("%3d: Got       %d %d %d %d", req->sd, msg.msg_controllen, cmsg->cmsg_len, cmsg->cmsg_level, cmsg->cmsg_type);
+               else
+                       LogMsg("%3d: Got       %d NULL", req->sd, msg.msg_controllen);
 #endif // DEBUG_64BIT_SCM_RIGHTS
                if (msg.msg_controllen == sizeof(cbuf) &&
-                       cmsg->cmsg_len     == sizeof(cbuf) &&
-                       cmsg->cmsg_level   == SOL_SOCKET   &&
+                       cmsg->cmsg_len     == CMSG_LEN(sizeof(dnssd_sock_t)) &&
+                       cmsg->cmsg_level   == SOL_SOCKET &&
                        cmsg->cmsg_type    == SCM_RIGHTS)
                        {
 #if APPLE_OSX_mDNSResponder