[OS-663] Post-6.5 Illumos sync

Merge https://github.com/illumos/illumos-gate

Conflicts:
	exception_lists/packaging
	usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
	usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
	usr/src/cmd/lp/Makefile
	usr/src/cmd/lp/cmd/lpadmin/options.c
	usr/src/cmd/lp/cmd/lpfilter.c
	usr/src/cmd/lp/cmd/lpforms.c
	usr/src/cmd/lp/cmd/lpusers.c
	usr/src/cmd/lp/lib/lp/isterminfo.c
	usr/src/cmd/lp/lib/lp/tidbit.c
	usr/src/cmd/terminfo/att.ti
	usr/src/cmd/zpool/zpool_main.c
	usr/src/common/dis/i386/dis_tables.c
	usr/src/lib/libdtrace/common/dt_options.c
	usr/src/lib/libzfs/common/libzfs_dataset.c
	usr/src/man/man1m/dladm.1m
	usr/src/man/man1m/flowadm.1m
	usr/src/man/man1m/zoneadm.1m
	usr/src/man/man1m/zonecfg.1m
	usr/src/pkg/manifests/print-lp-print-client-commands.mf
	usr/src/pkg/manifests/print-lp.mf
	usr/src/uts/common/fs/zfs/sys/zio.h
	usr/src/uts/common/fs/zfs/zio.c
	usr/src/uts/i86pc/ml/mach_offsets.in
	usr/src/uts/intel/amd64/ml/mach_offsets.in
	usr/src/uts/intel/sys/tss.h

1 files changed, 0 insertions, 81 deletions

diff --git a/usr/src/cmd/tcpd/ncr.c b/usr/src/cmd/tcpd/ncr.c
deleted file mode 100644
index b903fb85a5..0000000000
--- a/usr/src/cmd/tcpd/ncr.c
+++ /dev/null
@@ -1,81 +0,0 @@
- /*
-  * This part for NCR UNIX with is from Andrew Maffei (arm@aqua.whoi.edu). It
-  * assumes TLI throughout. In order to look up endpoint address information
-  * we must talk to the "timod" streams module. For some reason "timod" wants
-  * to sit directly on top of the device driver. Therefore we pop off all
-  * streams modules except the driver, install the "timod" module so that we
-  * can figure out network addresses, and then restore the original state.
-  */
-
-#ifndef lint
-static char sccsid[] = "@(#) ncr.c 1.1 94/12/28 17:42:34";
-#endif
-
-#include <sys/types.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <sys/tiuser.h>
-#include <stropts.h>
-#include <sys/conf.h>
-
-#include "tcpd.h"
-
-#define MAX_MODULE_COUNT	10	/* XXX */
-
-/* fromhost - tear down the streams stack then rebuild it */
-
-void    fromhost(request)
-struct request_info *request;
-{
-    int     i;
-    int     num_mod;
-    struct str_list str_list;
-    struct str_mlist mod_buffer[MAX_MODULE_COUNT];
-    int     fd = request->fd;
-
-    str_list.sl_nmods = MAX_MODULE_COUNT;
-    str_list.sl_modlist = &mod_buffer[0];
-
-    /*
-     * On systems with WIN streams support we have to be careful about what
-     * is on the stream we are passed. This code POPs off all modules above
-     * the pseudo driver, pushes timod, gets the host address information,
-     * pops timod and then pushes all modules back on the stream.
-     * 
-     * Some state may be lost in this process. /usr/etc/tlid seems to do special
-     * things to the stream depending on the TCP port being serviced. (not a
-     * very nice thing to do!). It is unclear what to do if this code breaks
-     * - the stream may be left in an unknown condition.
-     */
-    if ((num_mod = ioctl(fd, I_LIST, NULL)) < 0)
-	tcpd_warn("fromhost: LIST failed: %m");
-    if (ioctl(fd, I_LIST, &str_list) < 0)
-	tcpd_warn("fromhost: LIST failed: %m");
-
-    /*
-     * POP stream modules except for the driver.
-     */
-    for (i = 0; i < num_mod - 1; i++)
-	if (ioctl(fd, I_POP, 0) < 0)
-	    tcpd_warn("fromhost: POP %s: %m", mod_buffer[i].l_name);
-
-    /*
-     * PUSH timod so that host address ioctls can be executed.
-     */
-    if (ioctl(fd, I_PUSH, "timod") < 0)
-	tcpd_warn("fromhost: PUSH timod: %m");
-    tli_host(request);
-
-    /*
-     * POP timod, we're done with it now.
-     */
-    if (ioctl(fd, I_POP, 0) < 0)
-	tcpd_warn("fromhost: POP timod: %m");
-
-    /*
-     * Restore stream modules.
-     */
-    for (i = num_mod - 2; i >= 0; i--)
-	if (ioctl(fd, I_PUSH, mod_buffer[i].l_name) < 0)
-	    tcpd_warn("fromhost: PUSH %s: %m", mod_buffer[i].l_name);
-}