Re: CVS commit: src/lib/libc/resolv
On Oct 24, 2009, at 9:08 AM, Ty Sarna wrote: Unfortunately there's no way for me to use this feature currently. I think it would be sufficient if __res_check() were exposed and returned a flag indicating wether there was a changed or not. I will want to do some filtering of the search list in some cases, and it'd be better to build up my private modified copy of the search list only when the config changes rather than trying to figure it out on every query. Actually, better yet, return the time of last change instead of a flag. In the case of a threaded program that uses both the getXXX API and the low-level res_XXX api for some reason (perhaps MX lookups or something else not supported at the getXXX level), I guess it's possible that the nss module could end up res_get_state()'ing stale res_states multiple times and re-initing when it doesn't need to.
CVS commit: src
Module Name:src
Committed By: tsarna
Date: Sun Oct 25 00:17:06 UTC 2009
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/etc: nsswitch.conf
src/external/apache2/mDNSResponder/nss: Makefile
src/share/man/man5: nsswitch.conf.5
Added Files:
src/external/apache2/mDNSResponder/nss: nss_mdnsd.c
Removed Files:
src/external/apache2/mDNSResponder/nss: nss_mdns.c
Log Message:
Major enhancements to mdnsd nsswitch support:
- nss_mdns renamed to nss_multicast_dns for clarity and less chance of
confusion with nss_mdnsd (see next).
- Support using mdnsd for all unicast too with new nss_mdnsd module
(note: this mode requires an updated mdnsd too, not yet committed)
- Implement resolv.conf search directive support. Needed for nss_mdnsd,
potentially useful with nss_multicast_dns (you could now do
search example.com local in resolv.conf if you wanted to and it would
act as you might expect)
- Add references in nsswitch.conf man page and sample file
- Implement AI_CANONNAME
- Various bug fixes
To generate a diff of this commit:
cvs rdiff -u -r1.501 -r1.502 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.5 -r1.6 src/etc/nsswitch.conf
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/mDNSResponder/nss/Makefile
cvs rdiff -u -r1.1 -r0 src/external/apache2/mDNSResponder/nss/nss_mdns.c
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/nss/nss_mdnsd.c
cvs rdiff -u -r1.26 -r1.27 src/share/man/man5/nsswitch.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.501 src/distrib/sets/lists/base/shl.mi:1.502
--- src/distrib/sets/lists/base/shl.mi:1.501 Sun Oct 18 20:26:33 2009
+++ src/distrib/sets/lists/base/shl.mi Sun Oct 25 00:17:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.501 2009/10/18 20:26:33 pooka Exp $
+# $NetBSD: shl.mi,v 1.502 2009/10/25 00:17:06 tsarna Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -174,7 +174,9 @@
./usr/lib/libzfs.so.0.0base-zfs-shlib zfs,dynamicroot
./usr/lib/libzpool.so.0.0 base-zfs-shlib zfs,dynamicroot
./usr/lib/libzpool_pic.a base-zfs-shlib zfs,dynamicroot
-./usr/lib/nss_mdns.so.0base-mdns-shlib mdns
+./usr/lib/nss_mdns.so.0base-mdns-shlib mdns,obsolete
+./usr/lib/nss_mdnsd.so.0 base-mdns-shlib mdns
+./usr/lib/nss_multicast_dns.so.0 base-mdns-shlib mdns
./usr/lib/security/pam_afslog.so.3 base-sys-shlib kerberos,pam
./usr/lib/security/pam_chroot.so.3 base-sys-shlib pam
./usr/lib/security/pam_deny.so.3 base-sys-shlib pam
Index: src/etc/nsswitch.conf
diff -u src/etc/nsswitch.conf:1.5 src/etc/nsswitch.conf:1.6
--- src/etc/nsswitch.conf:1.5 Sun Oct 24 12:36:52 1999
+++ src/etc/nsswitch.conf Sun Oct 25 00:17:06 2009
@@ -1,4 +1,4 @@
-# $NetBSD: nsswitch.conf,v 1.5 1999/10/24 12:36:52 lukem Exp $
+# $NetBSD: nsswitch.conf,v 1.6 2009/10/25 00:17:06 tsarna Exp $
#
# nsswitch.conf(5) -
# name service switch configuration file
@@ -21,7 +21,7 @@
#
# group: compat, dns, files, nis
# group_compat: dns, nis
-# hosts: dns, files, nis
+# hosts: dns, files, nis, mdnsd, multicast_dns
# netgroup: files, nis
# networks: dns, files, nis
# passwd: compat, dns, files, nis
Index: src/external/apache2/mDNSResponder/nss/Makefile
diff -u src/external/apache2/mDNSResponder/nss/Makefile:1.1 src/external/apache2/mDNSResponder/nss/Makefile:1.2
--- src/external/apache2/mDNSResponder/nss/Makefile:1.1 Mon Oct 5 03:54:17 2009
+++ src/external/apache2/mDNSResponder/nss/Makefile Sun Oct 25 00:17:06 2009
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/10/05 03:54:17 tsarna Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/25 00:17:06 tsarna Exp $
-LIB= nss_mdns
+LIB= nss_mdnsd
SHLIB_MAJOR= 0
+LINKS= ${LIBDIR}/${LIB}.so.${SHLIB_MAJOR} \
+ ${LIBDIR}/nss_multicast_dns.so.${SHLIB_MAJOR}
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -11,7 +13,7 @@
.include ${.CURDIR}/../Makefile.inc
-SRCS= nss_mdns.c
+SRCS= nss_mdnsd.c
LDADD+= -ldns_sd
DPADD+= ${LIBDNS_SD}
Index: src/share/man/man5/nsswitch.conf.5
diff -u src/share/man/man5/nsswitch.conf.5:1.26 src/share/man/man5/nsswitch.conf.5:1.27
--- src/share/man/man5/nsswitch.conf.5:1.26 Wed Mar 11 13:51:47 2009
+++ src/share/man/man5/nsswitch.conf.5 Sun Oct 25 00:17:06 2009
@@ -1,4 +1,4 @@
-.\ $NetBSD: nsswitch.conf.5,v 1.26 2009/03/11 13:51:47 joerg Exp $
+.\ $NetBSD: nsswitch.conf.5,v 1.27 2009/10/25 00:17:06 tsarna Exp $
.\
.\ Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -58,7 +58,7 @@
take if that status code occurs.
.Ss Sources
The following sources are implemented:
-.Bl -column compat -offset indent -compact
+.Bl -column multicast_dns -offset indent -compact
.It Sy Source Description
.It files Local
CVS commit: src/external/apache2
Module Name:src Committed By: tsarna Date: Sat Oct 24 01:59:07 UTC 2009 Added Files: src/external/apache2: LICENSE-2.0 Log Message: Add a copy of the Apache 2.0 license here as requested by reed. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/apache2/LICENSE-2.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/apache2/LICENSE-2.0 diff -u /dev/null src/external/apache2/LICENSE-2.0:1.1 --- /dev/null Sat Oct 24 01:59:07 2009 +++ src/external/apache2/LICENSE-2.0 Sat Oct 24 01:59:07 2009 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + License shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + Licensor shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + Legal Entity shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + control means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + You (or Your) shall mean an individual or Legal Entity + exercising permissions granted by this License. + + Source form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + Object form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + Work shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + Derivative Works shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + Contribution shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, submitted + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as Not a Contribution. + + Contributor shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where
CVS commit: src/external
Module Name:src Committed By: tsarna Date: Sat Oct 24 03:55:27 UTC 2009 Modified Files: src/external: README Log Message: note apache2 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/README diff -u src/external/README:1.7 src/external/README:1.8 --- src/external/README:1.7 Tue Aug 18 21:30:31 2009 +++ src/external/README Sat Oct 24 03:55:27 2009 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.7 2009/08/18 21:30:31 wiz Exp $ +$NetBSD: README,v 1.8 2009/10/24 03:55:27 tsarna Exp $ Organization of Sources: @@ -41,6 +41,8 @@ The licenses currently used are: + apache2 Apache 2.0 license. + bsd BSD (or equivalent) licensed software, possibly with the advertising clause.
CVS commit: src/external/apache2/mDNSResponder/dist/mDNSPosix
Module Name:src
Committed By: tsarna
Date: Sat Oct 24 04:04:40 UTC 2009
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
Log Message:
Add interface list dump to debugging output.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.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/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.3 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.4
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.3 Sat Oct 3 00:03:05 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Sat Oct 24 04:04:40 2009
@@ -183,10 +183,24 @@
// Dump a little log of what we've been up to.
{
DNSServer *s;
+PosixNetworkInterface *i;
LogMsg( BEGIN STATE LOG );
udsserver_info(m);
+LogMsgNoIdent(- Network Interfaces ---);
+for (i = (PosixNetworkInterface*)(m-HostInterfaces);
+i; i = (PosixNetworkInterface *)(i-coreIntf.next)) {
+LogMsg(%p %p %d %s%s%s%s%s %-8s %#a, i,
+(void *)(i-coreIntf.InterfaceID), i-index,
+i-coreIntf.InterfaceActive ? - : D,
+i-coreIntf.IPv4Available ? 4 : -,
+i-coreIntf.IPv6Available ? 6 : -,
+i-coreIntf.Advertise ? A : -,
+i-coreIntf.McastTxRx ? M : -,
+i-intfName, (i-coreIntf.ip));
+}
+
LogMsgNoIdent(- DNS Servers --);
if (!mDNSStorage.DNSServers) LogMsgNoIdent(None);
else
Re: CVS commit: src/usr.sbin/inetd
On Oct 22, 2009, at 12:34 PM, Jochen Kunz wrote: Add mDNS Service Directory support to inetd(8). inetd(8) can now advertize services in the mDNS-SD. (Per service configuration option in inetd.conf(5).) Thanks for coordinating with me. :-( I think the problem is more complicated than you realize. I appreciate that you gave quite some thought to some of the implementation issues (handling interface restrictions, marking the mdnsd socket CLOEXEC), but you seem to have missed other issues entirely (service name support, TXT records, etc). The feature as-is is of limited utility.
CVS commit: src
Module Name:src Committed By: tsarna Date: Thu Oct 22 23:04:59 UTC 2009 Modified Files: src/distrib/sets/lists/man: mi Removed Files: src/share/man/man8/man8.i386: w95boot.8 Log Message: Remove w95boot(8) manpage, long past being useful. To generate a diff of this commit: cvs rdiff -u -r1.1166 -r1.1167 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.10 -r0 src/share/man/man8/man8.i386/w95boot.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1166 src/distrib/sets/lists/man/mi:1.1167 --- src/distrib/sets/lists/man/mi:1.1166 Wed Oct 21 22:59:06 2009 +++ src/distrib/sets/lists/man/mi Thu Oct 22 23:04:59 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1166 2009/10/21 22:59:06 joerg Exp $ +# $NetBSD: mi,v 1.1167 2009/10/22 23:04:59 tsarna Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2165,7 +2165,7 @@ ./usr/share/man/cat8/i386/reboot.0 man-obsolete obsolete ./usr/share/man/cat8/i386/reboot_i386.0 man-obsolete obsolete ./usr/share/man/cat8/i386/vgaio.0 man-obsolete obsolete -./usr/share/man/cat8/i386/w95boot.0 man-sys-catman .cat +./usr/share/man/cat8/i386/w95boot.0 man-sys-catman .cat,obsolete ./usr/share/man/cat8/i386/zzz.0 man-obsolete obsolete ./usr/share/man/cat8/ibmnws/MAKEDEV.0 man-obsolete obsolete ./usr/share/man/cat8/identd.0 man-netutil-catman .cat @@ -4609,7 +4609,7 @@ ./usr/share/man/html8/i386/multiboot.html man-sys-htmlman html ./usr/share/man/html8/i386/ndiscvt.html man-netutil-htmlman html ./usr/share/man/html8/i386/pxeboot.html man-sys-htmlman html -./usr/share/man/html8/i386/w95boot.html man-sys-htmlman html +./usr/share/man/html8/i386/w95boot.html man-sys-htmlman html,obsolete ./usr/share/man/html8/identd.html man-netutil-htmlman html ./usr/share/man/html8/ifconfig.html man-netutil-htmlman html ./usr/share/man/html8/ifmcstat.html man-netutil-htmlman inet6,html @@ -7194,7 +7194,7 @@ ./usr/share/man/man8/i386/reboot.8 man-obsolete obsolete ./usr/share/man/man8/i386/reboot_i386.8 man-obsolete obsolete ./usr/share/man/man8/i386/vgaio.8 man-obsolete obsolete -./usr/share/man/man8/i386/w95boot.8 man-sys-man .man +./usr/share/man/man8/i386/w95boot.8 man-sys-man .man,obsolete ./usr/share/man/man8/i386/zzz.8 man-obsolete obsolete ./usr/share/man/man8/ibmnws/MAKEDEV.8 man-obsolete obsolete ./usr/share/man/man8/ibmnws/makedev.8 man-obsolete obsolete
CVS commit: src/lib/libutil
Module Name:src Committed By: tsarna Date: Thu Oct 22 23:08:03 UTC 2009 Modified Files: src/lib/libutil: ttyaction.3 Log Message: Update my email address to one I have used in this millenium. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libutil/ttyaction.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libutil/ttyaction.3 diff -u src/lib/libutil/ttyaction.3:1.13 src/lib/libutil/ttyaction.3:1.14 --- src/lib/libutil/ttyaction.3:1.13 Wed Apr 30 13:10:52 2008 +++ src/lib/libutil/ttyaction.3 Thu Oct 22 23:08:03 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: ttyaction.3,v 1.13 2008/04/30 13:10:52 martin Exp $ +.\ $NetBSD: ttyaction.3,v 1.14 2009/10/22 23:08:03 tsarna Exp $ .\ .\ Copyright (c) 1996 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -91,7 +91,7 @@ .An Chris G. Demetriou .Aq c...@netbsd.org , .An Ty Sarna -.Aq tsa...@endicor.com . +.Aq tsa...@netbsd.org . .Sh BUGS There should be some .Em other
CVS commit: src/share/man/man4
Module Name:src Committed By: tsarna Date: Thu Oct 22 23:10:22 UTC 2009 Modified Files: src/share/man/man4: auvia.4 Log Message: Take credit for original work. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/auvia.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/auvia.4 diff -u src/share/man/man4/auvia.4:1.7 src/share/man/man4/auvia.4:1.8 --- src/share/man/man4/auvia.4:1.7 Wed Apr 30 13:10:53 2008 +++ src/share/man/man4/auvia.4 Thu Oct 22 23:10:22 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: auvia.4,v 1.7 2008/04/30 13:10:53 martin Exp $ +.\ $NetBSD: auvia.4,v 1.8 2009/10/22 23:10:22 tsarna Exp $ .\ .\ Copyright (c) 2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -49,5 +49,5 @@ .Sh HISTORY The .Nm -device driver appeared in +driver was originally written by Tyler C. Sarna for .Nx 1.5 .
CVS commit: src
Module Name:src
Committed By: tsarna
Date: Mon Oct 5 03:54:17 UTC 2009
Modified Files:
src/distrib/sets/lists/base: shl.mi
src/external/apache2/mDNSResponder: Makefile
Added Files:
src/external/apache2/mDNSResponder/nss: Makefile nss_mdns.c
Log Message:
Add nss_mdns, a nsswitch plugin for host lookups vis mDNS (Bonjour),
eg hostname.local. This is a work in progress, but basically
functional. (note: this requires mdnsd to be running.)
To generate a diff of this commit:
cvs rdiff -u -r1.495 -r1.496 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/mDNSResponder/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/nss/Makefile \
src/external/apache2/mDNSResponder/nss/nss_mdns.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.495 src/distrib/sets/lists/base/shl.mi:1.496
--- src/distrib/sets/lists/base/shl.mi:1.495 Sun Oct 4 22:06:34 2009
+++ src/distrib/sets/lists/base/shl.mi Mon Oct 5 03:54:17 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.495 2009/10/04 22:06:34 christos Exp $
+# $NetBSD: shl.mi,v 1.496 2009/10/05 03:54:17 tsarna Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -166,6 +166,7 @@
./usr/lib/libutil.so.7.17 base-sys-shlib
./usr/lib/libwrap.so.1.0 base-net-shlib
./usr/lib/libz.so.1.0base-sys-shlib
+./usr/lib/nss_mdns.so.0base-mdns-shlib mdns
./usr/lib/security/pam_afslog.so.3 base-sys-shlib kerberos,pam
./usr/lib/security/pam_chroot.so.3 base-sys-shlib pam
./usr/lib/security/pam_deny.so.3 base-sys-shlib pam
Index: src/external/apache2/mDNSResponder/Makefile
diff -u src/external/apache2/mDNSResponder/Makefile:1.1 src/external/apache2/mDNSResponder/Makefile:1.2
--- src/external/apache2/mDNSResponder/Makefile:1.1 Tue Sep 29 23:56:27 2009
+++ src/external/apache2/mDNSResponder/Makefile Mon Oct 5 03:54:17 2009
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/05 03:54:17 tsarna Exp $
-SUBDIR= usr.bin usr.sbin
+SUBDIR= usr.bin usr.sbin nss
.include bsd.subdir.mk
Added files:
Index: src/external/apache2/mDNSResponder/nss/Makefile
diff -u /dev/null src/external/apache2/mDNSResponder/nss/Makefile:1.1
--- /dev/null Mon Oct 5 03:54:17 2009
+++ src/external/apache2/mDNSResponder/nss/Makefile Mon Oct 5 03:54:17 2009
@@ -0,0 +1,36 @@
+# $NetBSD: Makefile,v 1.1 2009/10/05 03:54:17 tsarna Exp $
+
+LIB= nss_mdns
+SHLIB_MAJOR= 0
+
+NOLINT= # don't build a lint library
+NOPROFILE= # don't build a profile library
+NOPICINSTALL= # don't install _pic.a library
+
+.include bsd.own.mk
+
+.include ${.CURDIR}/../Makefile.inc
+
+SRCS= nss_mdns.c
+LDADD+= -ldns_sd
+DPADD+= ${LIBDNS_SD}
+
+.if ${MKPIC} != no
+.PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
+libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
+.else
+libinstall::
+.endif
+
+.include bsd.lib.mk
+
+${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}: lib${LIB}.so.${SHLIB_FULLVERSION}
+ ${_MKTARGET_INSTALL}
+ ${INSTALL_FILE} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+ ${.ALLSRC} ${.TARGET}
+
+#.if defined(LD32DIR)
+#LIBDIR=/usr/lib/${LD32DIR}
+#.else
+#LIBDIR=/usr/lib
+#.endif
Index: src/external/apache2/mDNSResponder/nss/nss_mdns.c
diff -u /dev/null src/external/apache2/mDNSResponder/nss/nss_mdns.c:1.1
--- /dev/null Mon Oct 5 03:54:17 2009
+++ src/external/apache2/mDNSResponder/nss/nss_mdns.c Mon Oct 5 03:54:17 2009
@@ -0,0 +1,673 @@
+/* $NetBSD: nss_mdns.c,v 1.1 2009/10/05 03:54:17 tsarna Exp $ */
+
+/*-
+ * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Tyler C. Sarna
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
CVS commit: src/external/apache2/mDNSResponder
Module Name:src
Committed By: tsarna
Date: Sat Oct 3 00:03:05 UTC 2009
Modified Files:
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
Log Message:
Make signals match what OS X and the manpage say. Implement toggles for
debug and packet trace logging.
Make this conditional on HAVE_SIGINFO. Presumably lack of SIGINFO as a
standard posix feature is why they went with different signals here in
the first place, but since we have it, let's use it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
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/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.2 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.3
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.2 Thu Oct 1 16:36:20 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Sat Oct 3 00:03:05 2009
@@ -213,6 +213,10 @@
mDNSPosixListenForSignalInEventLoop(SIGINT);
mDNSPosixListenForSignalInEventLoop(SIGTERM);
mDNSPosixListenForSignalInEventLoop(SIGUSR1);
+#ifdef HAVE_SIGINFO
+ mDNSPosixListenForSignalInEventLoop(SIGUSR2);
+ mDNSPosixListenForSignalInEventLoop(SIGINFO);
+#endif
mDNSPosixListenForSignalInEventLoop(SIGPIPE);
mDNSPosixListenForSignalInEventLoop(SIGHUP) ;
@@ -239,7 +243,22 @@
(void) mDNSPosixRunEventLoopOnce(m, timeout, signals, gotData);
if (sigismember(signals, SIGHUP )) Reconfigure(m);
+#ifdef HAVE_SIGINFO
+/* use OSX-compatible signals since we can, and gain enhanced debugging */
+ if (sigismember(signals, SIGINFO)) DumpStateLog(m);
+ if (sigismember(signals, SIGUSR1))
+ {
+ mDNS_LoggingEnabled = mDNS_LoggingEnabled ? 0 : 1;
+ LogMsg(SIGUSR1: Logging %s, mDNS_LoggingEnabled ? Enabled : Disabled);
+ }
+ if (sigismember(signals, SIGUSR2))
+ {
+ mDNS_PacketLoggingEnabled = mDNS_PacketLoggingEnabled ? 0 : 1;
+ LogMsg(SIGUSR2: Packet Logging %s, mDNS_PacketLoggingEnabled ? Enabled : Disabled);
+ }
+#else
if (sigismember(signals, SIGUSR1)) DumpStateLog(m);
+#endif
// SIGPIPE happens when we try to write to a dead client; death should be detected soon in request_callback() and cleaned up.
if (sigismember(signals, SIGPIPE)) LogMsg(Received SIGPIPE - ignoring);
if (sigismember(signals, SIGINT) || sigismember(signals, SIGTERM)) break;
Index: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.3 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.4
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.3 Thu Oct 1 10:01:14 2009
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile Sat Oct 3 00:03:05 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/10/01 10:01:14 tron Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/03 00:03:05 tsarna Exp $
PROG= mdnsd
@@ -6,7 +6,8 @@
.PATH: ${DIST}/mDNSPosix ${DIST}/mDNSCore ${DIST}/mDNSShared
-CPPFLAGS+=-I${DIST}/mDNSCore -I${DIST}/mDNSShared -DPROGRAM_NAME=\mdnsd\
+CPPFLAGS+=-I${DIST}/mDNSCore -I${DIST}/mDNSShared \
+ -DPROGRAM_NAME=\mdnsd\ -DHAVE_SIGINFO
SRCS= PosixDaemon.c mDNSPosix.c mDNSUNP.c mDNS.c DNSDigest.c uDNS.c \
DNSCommon.c uds_daemon.c mDNSDebug.c dnssd_ipc.c GenLinkedList.c \
PlatformCommon.c
CVS commit: src
Module Name:src
Committed By: tsarna
Date: Thu Oct 1 16:36:21 UTC 2009
Modified Files:
src/etc/defaults: rc.conf
src/external/apache2/mDNSResponder/dist/mDNSPosix: PosixDaemon.c
mDNSPosix.c
src/external/apache2/mDNSResponder/usr.sbin: Makefile.inc
Log Message:
mdnsd enhancements and fixes:
- Enhance the built-in drop-privs support and use it instead of
having the rc.conf do it. Avoids log error on startup.
From OpenSolaris, with enhancements.
- Add dumping of the unicast server list to the DumpStateLog
debugging output, a'la Mac OS X.
- Fix a locking botch that caused warnings in the log.
- Fix FILE leak. From OpenSolaris.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/etc/defaults/rc.conf
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.108 src/etc/defaults/rc.conf:1.109
--- src/etc/defaults/rc.conf:1.108 Tue Sep 29 23:56:27 2009
+++ src/etc/defaults/rc.conf Thu Oct 1 16:36:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.108 2009/09/29 23:56:27 tsarna Exp $
+# $NetBSD: rc.conf,v 1.109 2009/10/01 16:36:20 tsarna Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -160,7 +160,7 @@
# Networking startup.
#
-mdnsd=NO mdnsd_user=_mdnsd
+mdnsd=NO
ipfilter=NO ipfilter_flags= # uses /etc/ipf.conf
ipnat=NO # uses /etc/ipnat.conf
ipfs=NO ipfs_flags= # save/load ipnat and ipf states
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c:1.1.1.1 Tue Sep 29 22:14:13 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c Thu Oct 1 16:36:20 2009
@@ -101,8 +101,13 @@
#include mDNSPosix.h
#include mDNSUNP.h // For daemon()
#include uds_daemon.h
+#include DNSCommon.h
#include PlatformCommon.h
+#ifndef MDNSD_USER
+#define MDNSD_USER nobody
+#endif
+
#define CONFIG_FILE /etc/mdnsd.conf
static domainname DynDNSZone;// Default wide-area zone for service registration
static domainname DynDNSHostname;
@@ -143,8 +148,10 @@
mDNSAddr DynDNSIP;
const mDNSAddr dummy = { mDNSAddrType_IPv4, { { { 1, 1, 1, 1 } } } };;
mDNS_SetPrimaryInterfaceInfo(m, NULL, NULL, NULL);
+mDNS_Lock(m);
if (ParseDNSServers(m, uDNS_SERVERS_FILE) 0)
LogMsg(Unable to parse DNS server list. Unicast DNS-SD unavailable);
+mDNS_Unlock(m);
ReadDDNSSettingsFromConfFile(m, CONFIG_FILE, DynDNSHostname, DynDNSZone, NULL);
mDNSPlatformSourceAddrForDest(DynDNSIP, dummy);
if (DynDNSHostname.c[0]) mDNS_AddDynDNSHostName(m, DynDNSHostname, NULL, NULL);
@@ -175,8 +182,26 @@
mDNSlocal void DumpStateLog(mDNS *const m)
// Dump a little log of what we've been up to.
{
+ DNSServer *s;
+
LogMsg( BEGIN STATE LOG );
udsserver_info(m);
+
+LogMsgNoIdent(- DNS Servers --);
+if (!mDNSStorage.DNSServers) LogMsgNoIdent(None);
+else
+{
+for (s = m-DNSServers; s; s = s-next)
+{
+LogMsgNoIdent(DNS Server %##s %#a:%d %s,
+s-domain.c, s-addr, mDNSVal16(s-port),
+s-teststate == DNSServer_Untested ? (Untested) :
+s-teststate == DNSServer_Passed ?:
+s-teststate == DNSServer_Failed ? (Failed) :
+s-teststate == DNSServer_Disabled ? (Disabled) : (Unknown state));
+}
+}
+
LogMsg( END STATE LOG );
}
@@ -241,11 +266,21 @@
// Now that we're finished with anything privileged, switch over to running as nobody
if (mStatus_NoError == err)
{
- const struct passwd *pw = getpwnam(nobody);
+ const struct passwd *pw = getpwnam(MDNSD_USER);
if (pw != NULL)
+ {
+ setgid(pw-pw_gid);
setuid(pw-pw_uid);
+ }
else
- LogMsg(WARNING: mdnsd continuing as root because user \nobody\ does not exist);
+#ifdef MDNSD_NOROOT
+{
+ LogMsg(WARNING: mdnsd exiting because user \MDNSD_USER\ does not exist);
+err = mStatus_Invalid;
+}
+#else
+ LogMsg(WARNING: mdnsd continuing as root because user \MDNSD_USER\ does not exist);
+#endif
}
if (mStatus_NoError ==
CVS commit: src
Module Name:src Committed By: tsarna Date: Fri Oct 2 02:45:30 UTC 2009 Modified Files: src/distrib/sets/lists/base: md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: mi src/include: netdb.h src/lib/libc: shlib_version src/lib/libc/net: Makefile.inc getaddrinfo.3 getaddrinfo.c Log Message: Introduce allocaddrinfo(3) to make writing getaddrinfo() nss plugins easier. Discussed on tech-net. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.61 -r1.62 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.493 -r1.494 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1314 -r1.1315 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.61 -r1.62 src/include/netdb.h cvs rdiff -u -r1.214 -r1.215 src/lib/libc/shlib_version cvs rdiff -u -r1.77 -r1.78 src/lib/libc/net/Makefile.inc cvs rdiff -u -r1.46 -r1.47 src/lib/libc/net/getaddrinfo.3 cvs rdiff -u -r1.92 -r1.93 src/lib/libc/net/getaddrinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.68 src/distrib/sets/lists/base/md.amd64:1.69 --- src/distrib/sets/lists/base/md.amd64:1.68 Fri Sep 11 16:01:59 2009 +++ src/distrib/sets/lists/base/md.amd64 Fri Oct 2 02:45:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.68 2009/09/11 16:01:59 mrg Exp $ +# $NetBSD: md.amd64,v 1.69 2009/10/02 02:45:28 tsarna Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -67,7 +67,7 @@ ./usr/lib/i386/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/i386/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/i386/libc.so.12 base-compat-shlib compat,pic -./usr/lib/i386/libc.so.12.170 base-compat-shlib compat,pic +./usr/lib/i386/libc.so.12.171 base-compat-shlib compat,pic ./usr/lib/i386/libcom_err.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/i386/libcom_err.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/i386/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/md.sparc64 diff -u src/distrib/sets/lists/base/md.sparc64:1.61 src/distrib/sets/lists/base/md.sparc64:1.62 --- src/distrib/sets/lists/base/md.sparc64:1.61 Fri Sep 11 22:36:53 2009 +++ src/distrib/sets/lists/base/md.sparc64 Fri Oct 2 02:45:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.61 2009/09/11 22:36:53 mrg Exp $ +# $NetBSD: md.sparc64,v 1.62 2009/10/02 02:45:28 tsarna Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformatbase-util-bin @@ -65,7 +65,7 @@ ./usr/lib/sparc/libbz2.so.1 base-compat-shlib compat,pic ./usr/lib/sparc/libbz2.so.1.1 base-compat-shlib compat,pic ./usr/lib/sparc/libc.so.12 base-compat-shlib compat,pic -./usr/lib/sparc/libc.so.12.170 base-compat-shlib compat,pic +./usr/lib/sparc/libc.so.12.171 base-compat-shlib compat,pic ./usr/lib/sparc/libcom_err.so.6 base-compat-shlib compat,pic ./usr/lib/sparc/libcom_err.so.6.0 base-compat-shlib compat,pic ./usr/lib/sparc/libcrypt.so.1 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.493 src/distrib/sets/lists/base/shl.mi:1.494 --- src/distrib/sets/lists/base/shl.mi:1.493 Wed Sep 30 03:41:12 2009 +++ src/distrib/sets/lists/base/shl.mi Fri Oct 2 02:45:28 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.493 2009/09/30 03:41:12 tsarna Exp $ +# $NetBSD: shl.mi,v 1.494 2009/10/02 02:45:28 tsarna Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -13,7 +13,7 @@ # # Note: libtermcap and libtermlib are hardlinked and share the same version. # -./lib/libc.so.12.170base-sys-shlib dynamicroot +./lib/libc.so.12.171base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot ./lib/libcrypto.so.6.0base-crypto-shlib crypto,dynamicroot ./lib/libdevmapper.so.1.0 base-lvm-shlib lvm,dynamicroot @@ -61,7 +61,7 @@ ./usr/lib/libbluetooth.so.4.2 base-sys-shlib ./usr/lib/libbsdmalloc.so.0.0 base-sys-shlib ./usr/lib/libbz2.so.1.1base-sys-shlib -./usr/lib/libc.so.12.170 base-sys-shlib +./usr/lib/libc.so.12.171 base-sys-shlib ./usr/lib/libcom_err.so.6.0 base-krb5-shlib kerberos ./usr/lib/libcrypt.so.1.0 base-sys-shlib ./usr/lib/libcrypto.so.6.0 base-crypto-shlib crypto Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1314 src/distrib/sets/lists/comp/mi:1.1315 --- src/distrib/sets/lists/comp/mi:1.1314 Tue Sep 29 23:56:26 2009 +++ src/distrib/sets/lists/comp/mi Fri Oct 2 02:45:29 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1314 2009/09/29 23:56:26 tsarna Exp $ +# $NetBSD: mi,v 1.1315 2009/10/02 02:45:29 tsarna Exp $ # # Note: don't delete
CVS commit: src/doc
Module Name:src Committed By: tsarna Date: Fri Oct 2 04:26:52 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Missed name and date on last To generate a diff of this commit: cvs rdiff -u -r1.1296 -r1.1297 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1296 src/doc/CHANGES:1.1297 --- src/doc/CHANGES:1.1296 Thu Oct 1 00:25:14 2009 +++ src/doc/CHANGES Fri Oct 2 04:26:52 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1296 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1297 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -408,3 +408,4 @@ wb(4): Add a driver for Winbond W83L518D SD/MMC readers. [jmcneill 20090930] mdnsd(8), dns-sd(1), libdns_sd: import mDNSResponder 212.1 + [tsarna 20090929]
CVS commit: src/external/apache2/mDNSResponder
Module Name:src
Committed By: tsarna
Date: Thu Oct 1 00:22:03 UTC 2009
Modified Files:
src/external/apache2/mDNSResponder: Makefile.inc
src/external/apache2/mDNSResponder/dist/mDNSShared: uds_daemon.c
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
Log Message:
Two minor tweaks:
- Build with MDNS_VERSIONSTR_NODTS a'la OpenSolaris, to exclude
__DATE__/__TIME__, for repeatable builds.
- log under mdnsd instead of mDNSResponder to reduce confusion.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/apache2/mDNSResponder/Makefile.inc
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
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/Makefile.inc
diff -u src/external/apache2/mDNSResponder/Makefile.inc:1.1 src/external/apache2/mDNSResponder/Makefile.inc:1.2
--- src/external/apache2/mDNSResponder/Makefile.inc:1.1 Tue Sep 29 23:56:27 2009
+++ src/external/apache2/mDNSResponder/Makefile.inc Thu Oct 1 00:22:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+# $NetBSD: Makefile.inc,v 1.2 2009/10/01 00:22:03 tsarna Exp $
.include bsd.own.mk
@@ -12,4 +12,5 @@
.endif
CPPFLAGS+= -DPID_FILE=\/var/run/mdnsd/mdnsd.pid\ \
- -DMDNS_UDS_SERVERPATH=\/var/run/mdnsd/mdnsd\
+ -DMDNS_UDS_SERVERPATH=\/var/run/mdnsd/mdnsd\ \
+ -DMDNS_VERSIONSTR_NODTS
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c:1.1.1.1 Tue Sep 29 22:14:17 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c Thu Oct 1 00:22:03 2009
@@ -1083,7 +1083,10 @@
// globals
mDNSexport mDNS mDNSStorage;
-mDNSexport const char ProgramName[] = mDNSResponder;
+#ifndef PROGRAM_NAME
+#define PROGRAM_NAME mDNSResponder
+#endif
+mDNSexport const char ProgramName[] = PROGRAM_NAME;
static dnssd_sock_t listenfd = dnssd_InvalidSocket;
static request_state *all_requests = NULL;
Index: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.1 src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.2
--- src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.1 Tue Sep 29 23:56:34 2009
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile Thu Oct 1 00:22:03 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/09/29 23:56:34 tsarna Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/01 00:22:03 tsarna Exp $
PROG= mdnsd
@@ -6,7 +6,7 @@
.PATH: ${DIST}/mDNSPosix ${DIST}/mDNSCore ${DIST}/mDNSShared
-CPPFLAGS+=-I${DIST}/mDNSCore -I${DIST}/mDNSShared
+CPPFLAGS+=-I${DIST}/mDNSCore -I${DIST}/mDNSShared -DPROGRAM_NAME=\mdnsd\
SRCS= PosixDaemon.c mDNSPosix.c mDNSUNP.c mDNS.c DNSDigest.c uDNS.c \
DNSCommon.c uds_daemon.c mDNSDebug.c dnssd_ipc.c GenLinkedList.c \
PlatformCommon.c
CVS commit: src/doc
Module Name:src Committed By: tsarna Date: Thu Oct 1 00:25:14 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Note mDNSResponder To generate a diff of this commit: cvs rdiff -u -r1.1295 -r1.1296 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1295 src/doc/CHANGES:1.1296 --- src/doc/CHANGES:1.1295 Wed Sep 30 20:54:56 2009 +++ src/doc/CHANGES Thu Oct 1 00:25:14 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1295 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1296 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -407,3 +407,4 @@ ichlpcib(4): Add gpio(4) support. [jakllsch 20090927] wb(4): Add a driver for Winbond W83L518D SD/MMC readers. [jmcneill 20090930] + mdnsd(8), dns-sd(1), libdns_sd: import mDNSResponder 212.1
CVS commit: src/external/apache2/mDNSResponder/dist
Module Name:src Committed By: tsarna Date: Tue Sep 29 22:14:17 UTC 2009 Update of /cvsroot/src/external/apache2/mDNSResponder/dist In directory ivanova.netbsd.org:/tmp/cvs-serv23795 Log Message: Import Apple's mDNSResponder 212.1 per tech-net discussion Status: Vendor Tag: APPLE Release Tags: mdnsresponder-212-1 N src/external/apache2/mDNSResponder/dist/LICENSE N src/external/apache2/mDNSResponder/dist/Clients/ClientCommon.c N src/external/apache2/mDNSResponder/dist/Clients/ClientCommon.h N src/external/apache2/mDNSResponder/dist/Clients/dns-sd.c N src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSEmbeddedAPI.h N src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c N src/external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.h N src/external/apache2/mDNSResponder/dist/mDNSCore/DNSDigest.c N src/external/apache2/mDNSResponder/dist/mDNSCore/mDNS.c N src/external/apache2/mDNSResponder/dist/mDNSCore/mDNSDebug.h N src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.c N src/external/apache2/mDNSResponder/dist/mDNSCore/uDNS.h N src/external/apache2/mDNSResponder/dist/mDNSPosix/PosixDaemon.c N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.h N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c N src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.h N src/external/apache2/mDNSResponder/dist/mDNSShared/CommonServices.h N src/external/apache2/mDNSResponder/dist/mDNSShared/GenLinkedList.c N src/external/apache2/mDNSResponder/dist/mDNSShared/GenLinkedList.h N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientlib.c N src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.c N src/external/apache2/mDNSResponder/dist/mDNSShared/PlatformCommon.h N src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 N src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_clientstub.c N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.c N src/external/apache2/mDNSResponder/dist/mDNSShared/dnssd_ipc.h N src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSDebug.c N src/external/apache2/mDNSResponder/dist/mDNSShared/mDNSResponder.8 N src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.c N src/external/apache2/mDNSResponder/dist/mDNSShared/uds_daemon.h No conflicts created by this import
CVS commit: src
Module Name:src
Committed By: tsarna
Date: Tue Sep 29 23:56:35 UTC 2009
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi shl.elf shl.mi
src/distrib/sets/lists/comp: mi shl.mi
src/distrib/sets/lists/etc: mi
src/distrib/sets/lists/man: mi
src/doc: 3RDPARTY
src/etc: Makefile group master.passwd
src/etc/defaults: rc.conf
src/etc/mtree: special
src/etc/rc.d: Makefile
src/external: Makefile
src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
mDNSUNP.c
src/external/apache2/mDNSResponder/dist/mDNSShared: dns-sd.1 dns_sd.h
src/external/lib: Makefile
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/usr.sbin/postinstall: postinstall
Added Files:
src/etc/rc.d: mdnsd
src/external/apache2: Makefile
src/external/apache2/mDNSResponder: Makefile Makefile.inc
prepare-import.sh
src/external/apache2/mDNSResponder/lib: Makefile shlib_version
src/external/apache2/mDNSResponder/usr.bin: Makefile Makefile.inc
src/external/apache2/mDNSResponder/usr.bin/dns-sd: Makefile
src/external/apache2/mDNSResponder/usr.sbin: Makefile Makefile.inc
src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile
Log Message:
Multicast DNS (Bonjour) support, based on Apple's mDNSResponder.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/sets.subr
cvs rdiff -u -r1.830 -r1.831 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.185 -r1.186 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.491 -r1.492 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.212 -r1.213 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1158 -r1.1159 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.717 -r1.718 src/doc/3RDPARTY
cvs rdiff -u -r1.372 -r1.373 src/etc/Makefile
cvs rdiff -u -r1.23 -r1.24 src/etc/group
cvs rdiff -u -r1.39 -r1.40 src/etc/master.passwd
cvs rdiff -u -r1.107 -r1.108 src/etc/defaults/rc.conf
cvs rdiff -u -r1.130 -r1.131 src/etc/mtree/special
cvs rdiff -u -r1.79 -r1.80 src/etc/rc.d/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/rc.d/mdnsd
cvs rdiff -u -r1.6 -r1.7 src/external/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/Makefile \
src/external/apache2/mDNSResponder/Makefile.inc \
src/external/apache2/mDNSResponder/prepare-import.sh
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c \
src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 \
src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/lib/Makefile \
src/external/apache2/mDNSResponder/lib/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/usr.bin/Makefile \
src/external/apache2/mDNSResponder/usr.bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/usr.sbin/Makefile \
src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/lib/Makefile
cvs rdiff -u -r1.49 -r1.50 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.252 -r1.253 src/share/mk/bsd.README
cvs rdiff -u -r1.582 -r1.583 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.104 -r1.105 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.87 src/distrib/sets/sets.subr:1.88
--- src/distrib/sets/sets.subr:1.87 Tue Sep 8 07:08:00 2009
+++ src/distrib/sets/sets.subr Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
+# $NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
#
#
@@ -53,6 +53,7 @@
MKMAN \
MKMANPAGES \
MKMANZ \
+ MKMDNS \
MKNLS \
MKNVI \
MKPAM \
@@ -235,7 +236,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
+# # $NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -285,6 +286,7 @@
# man ${MKMAN} != no
# manpages ${MKMANPAGES} != no
# manz ${MKMANZ} != no
+# mdns ${MKMDNS} != no
# nls ${MKNLS} != no
# nvi ${MKNVI} != no
# pam ${MKPAM} != no
Index:
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: tsarna Date: Wed Sep 30 03:41:12 UTC 2009 Modified Files: src/distrib/sets/lists/base: shl.elf shl.mi Log Message: Correct version number for libdns_sd to match last-minute change To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/distrib/sets/lists/base/shl.elf cvs rdiff -u -r1.492 -r1.493 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.elf diff -u src/distrib/sets/lists/base/shl.elf:1.186 src/distrib/sets/lists/base/shl.elf:1.187 --- src/distrib/sets/lists/base/shl.elf:1.186 Tue Sep 29 23:56:26 2009 +++ src/distrib/sets/lists/base/shl.elf Wed Sep 30 03:41:12 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.elf,v 1.186 2009/09/29 23:56:26 tsarna Exp $ +# $NetBSD: shl.elf,v 1.187 2009/09/30 03:41:12 tsarna Exp $ # # Note: Do not mark old major and major.minor shared libraries as # obsolete; just remove the entry, as third-party applications @@ -122,7 +122,7 @@ ./usr/lib/libdns.sobase-bind-shlib ./usr/lib/libdns.so.4base-bind-shlib ./usr/lib/libdns_sd.sobase-mdns-shlib mdns -./usr/lib/libdns_sd.so.1 base-mdns-shlib mdns +./usr/lib/libdns_sd.so.0 base-mdns-shlib mdns ./usr/lib/libedit.sobase-sys-shlib ./usr/lib/libedit.so.3base-sys-shlib ./usr/lib/libevent.sobase-sys-shlib Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.492 src/distrib/sets/lists/base/shl.mi:1.493 --- src/distrib/sets/lists/base/shl.mi:1.492 Tue Sep 29 23:56:26 2009 +++ src/distrib/sets/lists/base/shl.mi Wed Sep 30 03:41:12 2009 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.492 2009/09/29 23:56:26 tsarna Exp $ +# $NetBSD: shl.mi,v 1.493 2009/09/30 03:41:12 tsarna Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -69,7 +69,7 @@ ./usr/lib/libdes.so.8.1base-crypto-shlib crypto ./usr/lib/libdevmapper.so.1.0 base-lvm-shlib lvm ./usr/lib/libdns.so.4.0base-bind-shlib -./usr/lib/libdns_sd.so.1.0 base-mdns-shlib mdns +./usr/lib/libdns_sd.so.0.0 base-mdns-shlib mdns ./usr/lib/libedit.so.3.0 base-sys-shlib ./usr/lib/libevent.so.3.1 base-sys-shlib ./usr/lib/libfetch.so.3.0 base-sys-shlib
CVS commit: src/doc/roadmaps
Module Name:src Committed By: tsarna Date: Sat Sep 26 05:36:22 UTC 2009 Modified Files: src/doc/roadmaps: networking Log Message: Claim the multicast DNS project. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/doc/roadmaps/networking Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/roadmaps/networking diff -u src/doc/roadmaps/networking:1.7 src/doc/roadmaps/networking:1.8 --- src/doc/roadmaps/networking:1.7 Tue Sep 15 21:07:58 2009 +++ src/doc/roadmaps/networking Sat Sep 26 05:36:22 2009 @@ -1,4 +1,4 @@ -$NetBSD: networking,v 1.7 2009/09/15 21:07:58 agc Exp $ +$NetBSD: networking,v 1.8 2009/09/26 05:36:22 tsarna Exp $ NetBSD Networking Roadmap = @@ -45,7 +45,7 @@ Add support for multicast DNS (name.local) -Responsible: ??? +Responsible: tsarna 6. tcp support in libsa ---
