Merge commit '4213c2d8f7d24a0383e863621115570a68fb016c'
commit854468e7f085c2a6dff7cdb0c45351c03a77cb57
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 18:52:39 +0000 (17 14:52 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 17 Jul 2018 18:52:39 +0000 (17 14:52 -0400)
treebe01c953a8ffd6580ac6004f5f25b547c2f5ce19
parent762b511d1ccf7440b209ff1dafb550ca0a515ad4
parent4213c2d8f7d24a0383e863621115570a68fb016c
Merge commit '4213c2d8f7d24a0383e863621115570a68fb016c'
kernel/net/ip/ip6_asp.c
share/man/man4/mailer.conf.4
share/man/man8/ipaddrsel.8
usr/src/cmd/cmd-inet/etc/ipaddrsel.conf
usr/src/cmd/krb5/kadmin/kdcmgr/klookup.c
usr/src/cmd/krb5/krb5kdc/network.c
usr/src/lib/gss_mechs/mech_spnego/mech/spnego_mech.c