Merge commit 'b31320a79e2054c6739b5229259dbf98f3afc547' into merges
commitb878db47e77ccf269dff953ce79a24f2edbbe60c
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 19:15:03 +0000 (13 15:15 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fri, 13 Jul 2018 19:15:03 +0000 (13 15:15 -0400)
tree25a286e981f9e01604d80515091e679c7a71c311
parent46bce68105f971e99e7ad863bb2b17c2199f6e65
parentb31320a79e2054c6739b5229259dbf98f3afc547
Merge commit 'b31320a79e2054c6739b5229259dbf98f3afc547' into merges
24 files changed:
include/arpa/nameser.h
share/man/man4/dhcp_inittab.4
share/man/man8/dhcpagent.8
share/man/man8/ipadm.8
usr/src/cmd/cmd-inet/lib/ipmgmtd/ipmgmt_door.c
usr/src/cmd/cmd-inet/sbin/dhcpagent/Makefile
usr/src/cmd/cmd-inet/sbin/dhcpagent/agent.c
usr/src/cmd/cmd-inet/sbin/dhcpagent/dhcpagent.dfl
usr/src/cmd/cmd-inet/sbin/dhcpagent/packet.c
usr/src/cmd/cmd-inet/sbin/dhcpagent/packet.h
usr/src/cmd/cmd-inet/usr.sbin/ipadm/ipadm.c
usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/Makefile
usr/src/cmd/cmd-inet/usr.sbin/nwamcfg/nwamcfg.c
usr/src/common/net/dhcp/dhcp_impl.h
usr/src/lib/Makefile
usr/src/lib/libipadm/Makefile.com
usr/src/lib/libipadm/common/ipadm_addr.c
usr/src/lib/libipadm/common/ipadm_ndpd.c
usr/src/lib/libipadm/common/libipadm.c
usr/src/lib/libipadm/common/libipadm.h
usr/src/lib/libipadm/common/mapfile-vers
usr/src/lib/libnwam/Makefile.com
usr/src/lib/libnwam/common/libnwam_ncp.c
usr/src/uts/common/netinet/dhcp.h