diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-26 12:39:31 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-26 12:39:31 +0000 |
commit | cd6d980e0d9fa21ff08e425a6e31b5c05780c1f1 (patch) | |
tree | 1c6e16a0e6aa865155abb618d0b5aa5062a5f264 /exception_lists | |
parent | 3b429d37b9ba78c77cb6292ba61f0574315fb421 (diff) | |
parent | 5ffb0c9b03b5149ff4f5821a62be4a52408ada2a (diff) | |
download | illumos-joyent-cd6d980e0d9fa21ff08e425a6e31b5c05780c1f1.tar.gz |
[illumos-gate merge]
commit 5ffb0c9b03b5149ff4f5821a62be4a52408ada2a
3661 Sync mDNS with upstream
commit 8551f527eff6d736e8191795ffafe40abbdb71e6
6416 ptime -p could support multiple processes
Conflicts:
usr/src/man/man1/proc.1
usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSSDRecordRegistrar.java
usr/src/cmd/ptools/ptime/ptime.c
usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.c
Diffstat (limited to 'exception_lists')
-rw-r--r-- | exception_lists/copyright | 10 | ||||
-rw-r--r-- | exception_lists/cstyle | 24 | ||||
-rw-r--r-- | exception_lists/hdrchk | 16 | ||||
-rw-r--r-- | exception_lists/jstyle | 35 | ||||
-rw-r--r-- | exception_lists/keywords | 2 |
5 files changed, 87 insertions, 0 deletions
diff --git a/exception_lists/copyright b/exception_lists/copyright index 01169dbb04..2e4281fda5 100644 --- a/exception_lists/copyright +++ b/exception_lists/copyright @@ -30,6 +30,11 @@ exception_lists/closed-bins exception_lists/copyright exception_lists/cstyle exception_lists/hdrchk +usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.c +usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.h +usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c +usr/src/cmd/cmd-inet/usr.lib/mdnsd/THIRDPARTYLICENSE +usr/src/cmd/cmd-inet/usr.lib/mdnsd/*.[ch] usr/src/cmd/dtrace/test/tst/common/*/*.out usr/src/cmd/krb5/kadmin/cli/kadmin_ct.c usr/src/cmd/krb5/kadmin/cli/kadmin.h @@ -340,6 +345,11 @@ usr/src/lib/krb5/ss/mit-sipb-copyright.h usr/src/lib/krb5/ss/options.c usr/src/lib/krb5/ss/std_rqs.c usr/src/lib/krb5/ss/utils.c +usr/src/lib/libdns_sd/THIRDPARTYLICENSE +usr/src/lib/libdns_sd/common/*.[ch] +usr/src/lib/libdns_sd/java/common/JNISupport.c +usr/src/lib/libdns_sd/java/com/apple/dnssd/*.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/docs/examples/src/* usr/src/lib/librstp/common/*.[ch] usr/src/lib/librstp/common/[CRT]* # these have copyrights that the nit checker doesn't grok diff --git a/exception_lists/cstyle b/exception_lists/cstyle index 4a10306206..e0414c63ce 100644 --- a/exception_lists/cstyle +++ b/exception_lists/cstyle @@ -1,3 +1,21 @@ +usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.[ch] +usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c +usr/src/cmd/cmd-inet/usr.lib/mdnsd/CryptoAlg.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSDigest.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/PosixDaemon.c +usr/src/cmd/cmd-inet/usr.lib/mdnsd/PlatformCommon.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/GenLinkedList.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNS.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSDebug.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSEmbeddedAPI.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSPosix.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSUNP.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/nsec.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/anonymous.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/dnssec.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/uDNS.[ch] +usr/src/cmd/cmd-inet/usr.lib/mdnsd/uds_daemon.[ch] usr/src/cmd/krb5/kadmin/cli/kadmin_ct.c usr/src/cmd/krb5/kadmin/cli/kadmin.c usr/src/cmd/krb5/kadmin/cli/kadmin.h @@ -670,6 +688,12 @@ usr/src/lib/krb5/ss/ss_internal.h usr/src/lib/krb5/ss/ss.h usr/src/lib/krb5/ss/std_rqs.c usr/src/lib/krb5/ss/utils.c +usr/src/lib/libdns_sd/common/dnssd_clientlib.c +usr/src/lib/libdns_sd/common/dnssd_clientstub.c +usr/src/lib/libdns_sd/common/dnssd_ipc.c +usr/src/lib/libdns_sd/common/dnssd_ipc.h +usr/src/lib/libdns_sd/common/dns_sd.h +usr/src/lib/libdns_sd/java/common/JNISupport.c usr/src/lib/libgss/g_glue.c usr/src/lib/libresolv2/common usr/src/lib/librstp/common/base.h diff --git a/exception_lists/hdrchk b/exception_lists/hdrchk index 1aa0db27dd..476eab8a02 100644 --- a/exception_lists/hdrchk +++ b/exception_lists/hdrchk @@ -1,3 +1,17 @@ +usr/src/cmd/cmd-inet/usr.bin/dns-sd/ClientCommon.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/CryptoAlg.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/GenLinkedList.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/PlatformCommon.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/anonymous.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/dnssec.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSDebug.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSEmbeddedAPI.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSPosix.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/mDNSUNP.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/uDNS.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/nsec.h +usr/src/cmd/cmd-inet/usr.lib/mdnsd/uds_daemon.h usr/src/cmd/krb5/kadmin/cli/kadmin.h usr/src/cmd/krb5/kadmin/dbutil/import_err.h usr/src/cmd/krb5/kadmin/dbutil/kdb5_util.h @@ -179,6 +193,8 @@ usr/src/lib/krb5/ss/mit-sipb-copyright.h usr/src/lib/krb5/ss/ss_internal.h usr/src/lib/krb5/ss/ss.h usr/src/lib/libc/port/locale/utils.h +usr/src/lib/libdns_sd/common/dns_sd.h +usr/src/lib/libdns_sd/common/dnssd_ipc.h usr/src/lib/librstp/common/base.h usr/src/lib/librstp/common/choose.h usr/src/lib/librstp/common/edge.h diff --git a/exception_lists/jstyle b/exception_lists/jstyle new file mode 100644 index 0000000000..32e6665a9f --- /dev/null +++ b/exception_lists/jstyle @@ -0,0 +1,35 @@ +# +# This file and its contents are supplied under the terms of the +# Common Development and Distribution License ("CDDL"), version 1.0. +# You may only use this file in accordance with the terms of version +# 1.0 of the CDDL. +# +# A full copy of the text of the CDDL should have accompanied this +# source. A copy of the CDDL is also available via the Internet at +# http://www.illumos.org/license/CDDL. +# + +# +# Copyright 2016 Toomas Soome <tsoome@me.com> +# + +usr/src/lib/libdns_sd/java/com/apple/dnssd/BaseListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/BrowseListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSRecord.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSSD.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSSDException.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSSDRecordRegistrar.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSSDRegistration.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSSDService.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/DomainListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/QueryListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/RegisterListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/RegisterRecordListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/ResolveListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/TXTRecord.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/docs/examples/src/BrowserApp.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/docs/examples/src/SimpleChat.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/docs/examples/src/SwingBrowseListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/docs/examples/src/SwingDomainListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/docs/examples/src/SwingQueryListener.java +usr/src/lib/libdns_sd/java/com/apple/dnssd/docs/examples/src/SwingResolveListener.java diff --git a/exception_lists/keywords b/exception_lists/keywords index 2ac3a477c0..632d4e55ff 100644 --- a/exception_lists/keywords +++ b/exception_lists/keywords @@ -21,9 +21,11 @@ # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # Copyright 2011 Nexenta Systems, Inc. All rights reserved. # Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright 2016 Toomas Soome <tsoome@me.com> # syntax: glob +usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c usr/src/cmd/localedef/data/zh_CN.UTF-8.src usr/src/cmd/localedef/data/zh_HK.UTF-8.src usr/src/cmd/localedef/data/zh_MO.UTF-8.src |