--- a/exception_lists/packaging	Wed May 29 18:07:38 2019 +0200
+++ b/exception_lists/packaging	Fri May 31 14:32:40 2019 +0200
@@ -344,7 +344,6 @@
 var/svc/manifest/platform/sun4v					i386
 etc/svc/profile/platform_sun4v.xml				i386
 etc/svc/profile/platform_SUNW,SPARC-Enterprise.xml		i386
-etc/svc/profile/platform_SUNW,Sun-Fire-15000.xml		i386
 etc/svc/profile/platform_SUNW,Sun-Fire-880.xml			i386
 etc/svc/profile/platform_SUNW,Sun-Fire-V890.xml			i386
 etc/svc/profile/platform_SUNW,Sun-Fire.xml			i386
@@ -596,6 +595,8 @@
 usr/lib/mdb/proc/libfksmbsrv.so
 usr/lib/mdb/proc/amd64/libfksmbsrv.so		i386
 usr/lib/mdb/proc/sparcv9/libfksmbsrv.so		sparc
+usr/lib/mdb/proc/amd64/libmlsvc.so		i386
+usr/lib/mdb/proc/sparcv9/libmlsvc.so		sparc
 usr/lib/smbsrv/bind-helper
 usr/lib/smbsrv/fksmbd
 usr/lib/smbsrv/libfksmbsrv.so

--- a/usr/src/boot/sys/boot/common/module.c	Wed May 29 18:07:38 2019 +0200
+++ b/usr/src/boot/sys/boot/common/module.c	Fri May 31 14:32:40 2019 +0200
@@ -54,42 +54,43 @@
 
 struct moduledir {
 	char	*d_path;	/* path of modules directory */
-	u_char	*d_hints;	/* content of linker.hints file */
+	uchar_t	*d_hints;	/* content of linker.hints file */
 	int	d_hintsz;	/* size of hints data */
 	int	d_flags;
 	STAILQ_ENTRY(moduledir) d_link;
 };
 
-static int			file_load(char *filename, vm_offset_t dest, struct preloaded_file **result);
-static int			file_load_dependencies(struct preloaded_file *base_mod);
-static char *			file_search(const char *name, const char **extlist);
-static struct kernel_module *	file_findmodule(struct preloaded_file *fp, char *modname, struct mod_depend *verinfo);
-static int			file_havepath(const char *name);
-static char			*mod_searchmodule(char *name, struct mod_depend *verinfo);
-static void			file_insert_tail(struct preloaded_file *mp);
-struct file_metadata*		metadata_next(struct file_metadata *base_mp, int type);
-static void			moduledir_readhints(struct moduledir *mdp);
-static void			moduledir_rebuild(void);
+static int file_load(char *, vm_offset_t, struct preloaded_file **);
+static int file_load_dependencies(struct preloaded_file *);
+static char *file_search(const char *, const char **);
+static struct kernel_module *file_findmodule(struct preloaded_file *, char *,
+    struct mod_depend *);
+static int file_havepath(const char *);
+static char *mod_searchmodule(char *, struct mod_depend *);
+static void file_insert_tail(struct preloaded_file *);
+struct file_metadata *metadata_next(struct file_metadata *, int);
+static void moduledir_readhints(struct moduledir *);
+static void moduledir_rebuild(void);
 
 /* load address should be tweaked by first module loaded (kernel) */
-static vm_offset_t	loadaddr = 0;
+static vm_offset_t loadaddr = 0;
 
 #if defined(LOADER_FDT_SUPPORT)
-static const char	*default_searchpath =
-    "/boot/kernel;/boot/modules;/boot/dtb";
+static const char *default_searchpath = "/boot/kernel;/boot/modules;/boot/dtb";
 #else
-static const char	*default_searchpath ="/platform/i86pc";
+static const char *default_searchpath = "/platform/i86pc";
 #endif
 
-static STAILQ_HEAD(, moduledir) moduledir_list = STAILQ_HEAD_INITIALIZER(moduledir_list);
+static STAILQ_HEAD(, moduledir) moduledir_list =
+    STAILQ_HEAD_INITIALIZER(moduledir_list);
 
 struct preloaded_file *preloaded_files = NULL;
 
 static const char *kld_ext_list[] = {
-    ".ko",
-    "",
-    ".debug",
-    NULL
+	".ko",
+	"",
+	".debug",
+	NULL
 };
 
 
@@ -110,149 +111,110 @@
 static int
 command_load(int argc, char *argv[])
 {
-    char	*typestr;
-    int		dofile, dokld, ch, error;
+	char *typestr;
+	int dofile, dokld, ch, error;
+
+	dokld = dofile = 0;
+	optind = 1;
+	optreset = 1;
+	typestr = NULL;
+	if (argc == 1) {
+		command_errmsg = "no filename specified";
+		return (CMD_CRIT);
+	}
+	while ((ch = getopt(argc, argv, "kt:")) != -1) {
+		switch (ch) {
+		case 'k':
+			dokld = 1;
+			break;
+		case 't':
+			typestr = optarg;
+			dofile = 1;
+			break;
+		case '?':
+		default:
+			/* getopt has already reported an error */
+			return (CMD_OK);
+		}
+	}
+	argv += (optind - 1);
+	argc -= (optind - 1);
+
+	printf("Loading %s...\n", argv[1]);
+	/*
+	 * Request to load a raw file?
+	 */
+	if (dofile) {
+		struct preloaded_file *fp;
 
-    dokld = dofile = 0;
-    optind = 1;
-    optreset = 1;
-    typestr = NULL;
-    if (argc == 1) {
-	command_errmsg = "no filename specified";
-	return (CMD_CRIT);
-    }
-    while ((ch = getopt(argc, argv, "kt:")) != -1) {
-	switch(ch) {
-	case 'k':
-	    dokld = 1;
-	    break;
-	case 't':
-	    typestr = optarg;
-	    dofile = 1;
-	    break;
-	case '?':
-	default:
-	    /* getopt has already reported an error */
-	    return (CMD_OK);
+		if ((typestr == NULL) || (*typestr == 0)) {
+			command_errmsg = "invalid load type";
+			return (CMD_CRIT);
+		}
+
+		if (file_findfile(argv[1], typestr) != NULL) {
+			snprintf(command_errbuf, sizeof (command_errbuf),
+			    "warning: file '%s' already loaded", argv[1]);
+			return (CMD_WARN);
+		}
+
+		fp = file_loadraw(argv[1], typestr, argc - 2, argv + 2, 1);
+		if (fp != NULL)
+			return (CMD_OK);
+
+		/* Failing to load mfs_root is never going to end well! */
+		if (strcmp("mfs_root", typestr) == 0)
+			return (CMD_FATAL);
+
+		return (CMD_ERROR);
 	}
-    }
-    argv += (optind - 1);
-    argc -= (optind - 1);
+	/*
+	 * Do we have explicit KLD load ?
+	 */
+	if (dokld || file_havepath(argv[1])) {
+		error = mod_loadkld(argv[1], argc - 2, argv + 2);
+		if (error == EEXIST) {
+			snprintf(command_errbuf, sizeof (command_errbuf),
+			    "warning: KLD '%s' already loaded", argv[1]);
+			return (CMD_WARN);
+		}
 
-    printf("Loading %s...\n", argv[1]);
-    /*
-     * Request to load a raw file?
-     */
-    if (dofile) {
-	if ((typestr == NULL) || (*typestr == 0)) {
-	    command_errmsg = "invalid load type";
-	    return (CMD_CRIT);
+		return (error == 0 ? CMD_OK : CMD_CRIT);
 	}
-
-	if (file_findfile(argv[1], typestr) != NULL) {
+	/*
+	 * Looks like a request for a module.
+	 */
+	error = mod_load(argv[1], NULL, argc - 2, argv + 2);
+	if (error == EEXIST) {
 		snprintf(command_errbuf, sizeof (command_errbuf),
-		    "warning: file '%s' already loaded", argv[1]);
+		    "warning: module '%s' already loaded", argv[1]);
 		return (CMD_WARN);
 	}
 
-	if (file_loadraw(argv[1], typestr, argc - 2, argv + 2, 1) != NULL)
-		return (CMD_OK);
-
-	/* Failing to load mfs_root is never going to end well! */
-	if (strcmp("mfs_root", typestr) == 0)
-		return (CMD_FATAL);
-
-	return (CMD_ERROR);
-    }
-    /*
-     * Do we have explicit KLD load ?
-     */
-    if (dokld || file_havepath(argv[1])) {
-	error = mod_loadkld(argv[1], argc - 2, argv + 2);
-	if (error == EEXIST) {
-	    snprintf(command_errbuf, sizeof (command_errbuf),
-		"warning: KLD '%s' already loaded", argv[1]);
-	    return (CMD_WARN);
-	}
-
 	return (error == 0 ? CMD_OK : CMD_CRIT);
-    }
-    /*
-     * Looks like a request for a module.
-     */
-    error = mod_load(argv[1], NULL, argc - 2, argv + 2);
-    if (error == EEXIST) {
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "warning: module '%s' already loaded", argv[1]);
-	return (CMD_WARN);
-    }
-
-    return (error == 0 ? CMD_OK : CMD_CRIT);
 }
 
-#ifdef __FreeBSD__
-COMMAND_SET(load_geli, "load_geli", "load a geli key", command_load_geli);
-
-static int
-command_load_geli(int argc, char *argv[])
-{
-    char	typestr[80];
-    char	*cp;
-    int		ch, num;
-
-    if (argc < 3) {
-	    command_errmsg = "usage is [-n key#] <prov> <file>";
-	    return(CMD_ERROR);
-    }
-
-    num = 0;
-    optind = 1;
-    optreset = 1;
-    while ((ch = getopt(argc, argv, "n:")) != -1) {
-	switch(ch) {
-	case 'n':
-	    num = strtol(optarg, &cp, 0);
-	    if (cp == optarg) {
-		    snprintf(command_errbuf, sizeof (command_errbuf),
-			"bad key index '%s'", optarg);
-		    return(CMD_ERROR);
-	    }
-	    break;
-	case '?':
-	default:
-	    /* getopt has already reported an error */
-	    return(CMD_OK);
-	}
-    }
-    argv += (optind - 1);
-    argc -= (optind - 1);
-    sprintf(typestr, "%s:geli_keyfile%d", argv[1], num);
-    return (file_loadraw(argv[2], typestr, 0, NULL, 1) ? CMD_OK : CMD_ERROR);
-}
-#endif /* __FreeBSD__ */
-
 void
 unload(void)
 {
-    struct preloaded_file *fp;
+	struct preloaded_file *fp;
 
-    while (preloaded_files != NULL) {
-	fp = preloaded_files;
-	preloaded_files = preloaded_files->f_next;
-	file_discard(fp);
-    }
-    loadaddr = 0;
-    unsetenv("kernelname");
+	while (preloaded_files != NULL) {
+		fp = preloaded_files;
+		preloaded_files = preloaded_files->f_next;
+		file_discard(fp);
+	}
+	loadaddr = 0;
+	unsetenv("kernelname");
 }
 
 COMMAND_SET(unload, "unload", "unload all modules", command_unload);
 
 static int
-command_unload(int argc __attribute((unused)),
-    char *argv[] __attribute((unused)))
+command_unload(int argc __unused, char *argv[] __unused)
 {
-    unload();
-    return(CMD_OK);
+	unload();
+	return (CMD_OK);
 }
 
 COMMAND_SET(lsmod, "lsmod", "list loaded modules", command_lsmod);
@@ -260,85 +222,91 @@
 static int
 command_lsmod(int argc, char *argv[])
 {
-    struct preloaded_file	*fp;
-    struct kernel_module	*mp;
-    struct file_metadata	*md;
-    char			lbuf[80];
-    int				ch, verbose, hash, ret = 0;
+	struct preloaded_file *fp;
+	struct kernel_module *mp;
+	struct file_metadata *md;
+	char lbuf[80];
+	int ch, verbose, hash, ret = 0;
 
-    verbose = 0;
-    hash = 0;
-    optind = 1;
-    optreset = 1;
-    while ((ch = getopt(argc, argv, "vs")) != -1) {
-	switch(ch) {
-	case 'v':
-	    verbose = 1;
-	    break;
-	case 's':
-	    hash = 1;
-	    break;
-	case '?':
-	default:
-	    /* getopt has already reported an error */
-	    return(CMD_OK);
+	verbose = 0;
+	hash = 0;
+	optind = 1;
+	optreset = 1;
+	while ((ch = getopt(argc, argv, "vs")) != -1) {
+		switch (ch) {
+		case 'v':
+			verbose = 1;
+			break;
+		case 's':
+			hash = 1;
+			break;
+		case '?':
+		default:
+			/* getopt has already reported an error */
+			return (CMD_OK);
+		}
 	}
-    }
 
-    pager_open();
-    for (fp = preloaded_files; fp; fp = fp->f_next) {
-	sprintf(lbuf, " %p: ", (void *) fp->f_addr);
-	pager_output(lbuf);
-	pager_output(fp->f_name);
-	sprintf(lbuf, " (%s, 0x%lx)\n", fp->f_type, (long)fp->f_size);
-	if (pager_output(lbuf))
-	    break;
-	if (fp->f_args != NULL) {
-	    pager_output("    args: ");
-	    pager_output(fp->f_args);
-	    if (pager_output("\n"))
-		break;
-	    if (strcmp(fp->f_type, "hash") == 0) {
-		pager_output("    contents: ");
-		strncpy(lbuf, PTOV(fp->f_addr), fp->f_size);
+	pager_open();
+	for (fp = preloaded_files; fp; fp = fp->f_next) {
+		sprintf(lbuf, " %p: ", (void *) fp->f_addr);
+		pager_output(lbuf);
+		pager_output(fp->f_name);
+		sprintf(lbuf, " (%s, 0x%lx)\n", fp->f_type, (long)fp->f_size);
 		if (pager_output(lbuf))
 			break;
-	    }
-	}
+		if (fp->f_args != NULL) {
+			pager_output("    args: ");
+			pager_output(fp->f_args);
+			if (pager_output("\n"))
+				break;
+			if (strcmp(fp->f_type, "hash") == 0) {
+				pager_output("    contents: ");
+				strncpy(lbuf, PTOV(fp->f_addr), fp->f_size);
+				if (pager_output(lbuf))
+					break;
+			}
+		}
 
-	if (hash == 1) {
-		void *ptr = PTOV(fp->f_addr);
+		if (hash == 1) {
+			void *ptr = PTOV(fp->f_addr);
+
+			pager_output("  hash: ");
+			sha1(ptr, fp->f_size, (uint8_t *)lbuf);
+			for (int i = 0; i < SHA1_DIGEST_LENGTH; i++)
+				printf("%02x", (int)(lbuf[i] & 0xff));
+			if (pager_output("\n"))
+				break;
+		}
 
-		pager_output("  hash: ");
-		sha1(ptr, fp->f_size, (uint8_t *)lbuf);
-		for (int i = 0; i < SHA1_DIGEST_LENGTH; i++)
-			printf("%02x", (int)(lbuf[i] & 0xff));
-		if (pager_output("\n"))
+		if (fp->f_modules) {
+			pager_output("  modules: ");
+			for (mp = fp->f_modules; mp; mp = mp->m_next) {
+				sprintf(lbuf, "%s.%d ", mp->m_name,
+				    mp->m_version);
+				pager_output(lbuf);
+			}
+			if (pager_output("\n"))
+				break;
+		}
+		if (verbose) {
+			/*
+			 * XXX could add some formatting smarts here to
+			 * display some better
+			 */
+			for (md = fp->f_metadata; md != NULL;
+			    md = md->md_next) {
+				sprintf(lbuf, "      0x%04x, 0x%lx\n",
+				    md->md_type, (long)md->md_size);
+				if ((ret = pager_output(lbuf)))
+					break;
+			}
+		}
+		if (ret != 0)
 			break;
 	}
-
-	if (fp->f_modules) {
-	    pager_output("  modules: ");
-	    for (mp = fp->f_modules; mp; mp = mp->m_next) {
-		sprintf(lbuf, "%s.%d ", mp->m_name, mp->m_version);
-		pager_output(lbuf);
-	    }
-	    if (pager_output("\n"))
-		break;
-	}
-	if (verbose) {
-	    /* XXX could add some formatting smarts here to display some better */
-	    for (md = fp->f_metadata; md != NULL; md = md->md_next) {
-		sprintf(lbuf, "      0x%04x, 0x%lx\n", md->md_type, (long) md->md_size);
-		if ((ret = pager_output(lbuf)))
-		    break;
-	    }
-	}
-	if (ret)
-	    break;
-    }
-    pager_close();
-    return(CMD_OK);
+	pager_close();
+	return (CMD_OK);
 }
 
 /*
@@ -347,89 +315,93 @@
 int
 file_load(char *filename, vm_offset_t dest, struct preloaded_file **result)
 {
-    static int last_file_format = 0;
-    struct preloaded_file *fp;
-    int error;
-    int i;
+	static int last_file_format = 0;
+	struct preloaded_file *fp;
+	int error;
+	int i;
 
-    if (preloaded_files == NULL)
-	last_file_format = 0;
+	if (preloaded_files == NULL)
+		last_file_format = 0;
 
-    if (archsw.arch_loadaddr != NULL)
-	dest = archsw.arch_loadaddr(LOAD_RAW, filename, dest);
+	if (archsw.arch_loadaddr != NULL)
+		dest = archsw.arch_loadaddr(LOAD_RAW, filename, dest);
 
-    error = EFTYPE;
-    for (i = last_file_format, fp = NULL;
-	file_formats[i] && fp == NULL; i++) {
-	error = (file_formats[i]->l_load)(filename, dest, &fp);
-	if (error == 0) {
-	    fp->f_loader = last_file_format = i; /* remember the loader */
-	    *result = fp;
-	    break;
-	} else if (last_file_format == i && i != 0) {
-	    /* Restart from the beginning */
-	    i = -1;
-	    last_file_format = 0;
-	    fp = NULL;
-	    continue;
+	error = EFTYPE;
+	for (i = last_file_format, fp = NULL;
+	    file_formats[i] && fp == NULL; i++) {
+		error = (file_formats[i]->l_load)(filename, dest, &fp);
+		if (error == 0) {
+			/* remember the loader */
+			fp->f_loader = last_file_format = i;
+			*result = fp;
+			break;
+		} else if (last_file_format == i && i != 0) {
+			/* Restart from the beginning */
+			i = -1;
+			last_file_format = 0;
+			fp = NULL;
+			continue;
+		}
+		if (error == EFTYPE)
+			continue;	/* Unknown to this handler? */
+		if (error) {
+			snprintf(command_errbuf, sizeof (command_errbuf),
+			    "can't load file '%s': %s", filename,
+			    strerror(error));
+			break;
+		}
 	}
-	if (error == EFTYPE)
-	    continue;		/* Unknown to this handler? */
-	if (error) {
-	    snprintf(command_errbuf, sizeof (command_errbuf),
-		"can't load file '%s': %s", filename, strerror(error));
-	    break;
-	}
-    }
-    return (error);
+	return (error);
 }
 
 static int
 file_load_dependencies(struct preloaded_file *base_file)
 {
-    struct file_metadata *md;
-    struct preloaded_file *fp;
-    struct mod_depend *verinfo;
-    struct kernel_module *mp;
-    char *dmodname;
-    int error;
+	struct file_metadata *md;
+	struct preloaded_file *fp;
+	struct mod_depend *verinfo;
+	struct kernel_module *mp;
+	char *dmodname;
+	int error;
 
-    md = file_findmetadata(base_file, MODINFOMD_DEPLIST);
-    if (md == NULL)
-	return (0);
-    error = 0;
-    do {
-	verinfo = (struct mod_depend*)md->md_data;
-	dmodname = (char *)(verinfo + 1);
-	if (file_findmodule(NULL, dmodname, verinfo) == NULL) {
-	    printf("loading required module '%s'\n", dmodname);
-	    error = mod_load(dmodname, verinfo, 0, NULL);
-	    if (error)
-		break;
-	    /*
-	     * If module loaded via kld name which isn't listed
-	     * in the linker.hints file, we should check if it have
-	     * required version.
-	     */
-	    mp = file_findmodule(NULL, dmodname, verinfo);
-	    if (mp == NULL) {
-		snprintf(command_errbuf, sizeof (command_errbuf),
-		    "module '%s' exists but with wrong version", dmodname);
-		error = ENOENT;
-		break;
-	    }
+	md = file_findmetadata(base_file, MODINFOMD_DEPLIST);
+	if (md == NULL)
+		return (0);
+	error = 0;
+	do {
+		verinfo = (struct mod_depend *)md->md_data;
+		dmodname = (char *)(verinfo + 1);
+		if (file_findmodule(NULL, dmodname, verinfo) == NULL) {
+			printf("loading required module '%s'\n", dmodname);
+			error = mod_load(dmodname, verinfo, 0, NULL);
+			if (error)
+				break;
+			/*
+			 * If module loaded via kld name which isn't listed
+			 * in the linker.hints file, we should check if it have
+			 * required version.
+			 */
+			mp = file_findmodule(NULL, dmodname, verinfo);
+			if (mp == NULL) {
+				snprintf(command_errbuf,
+				    sizeof (command_errbuf),
+				    "module '%s' exists but with wrong version",
+				    dmodname);
+				error = ENOENT;
+				break;
+			}
+		}
+		md = metadata_next(md, MODINFOMD_DEPLIST);
+	} while (md);
+	if (!error)
+		return (0);
+	/* Load failed; discard everything */
+	while (base_file != NULL) {
+		fp = base_file;
+		base_file = base_file->f_next;
+		file_discard(fp);
 	}
-	md = metadata_next(md, MODINFOMD_DEPLIST);
-    } while (md);
-    if (!error)
-	return (0);
-    /* Load failed; discard everything */
-    while (base_file != NULL) {
-        fp = base_file;
-        base_file = base_file->f_next;
-        file_discard(fp);
-    }
-    return (error);
+	return (error);
 }
 
 /*
@@ -642,105 +614,108 @@
 struct preloaded_file *
 file_loadraw(const char *fname, char *type, int argc, char **argv, int insert)
 {
-    struct preloaded_file	*fp;
-    char			*name;
-    int				fd, got;
-    vm_offset_t			laddr;
-    struct stat			st;
+	struct preloaded_file *fp;
+	char *name;
+	int fd, got;
+	vm_offset_t laddr;
+	struct stat st;
 
-    /* We can't load first */
-    if ((file_findfile(NULL, NULL)) == NULL) {
-	command_errmsg = "can't load file before kernel";
-	return(NULL);
-    }
+	/* We can't load first */
+	if ((file_findfile(NULL, NULL)) == NULL) {
+		command_errmsg = "can't load file before kernel";
+		return (NULL);
+	}
 
-    /* locate the file on the load path */
-    name = file_search(fname, NULL);
-    if (name == NULL) {
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "can't find '%s'", fname);
-	return(NULL);
-    }
+	/* locate the file on the load path */
+	name = file_search(fname, NULL);
+	if (name == NULL) {
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "can't find '%s'", fname);
+		return (NULL);
+	}
 
-    if ((fd = open(name, O_RDONLY)) < 0) {
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "can't open '%s': %s", name, strerror(errno));
-	free(name);
-	return(NULL);
-    }
-    if (fstat(fd, &st) < 0) {
-	close(fd);
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "stat error '%s': %s", name, strerror(errno));
-	free(name);
-	return(NULL);
-    }
+	if ((fd = open(name, O_RDONLY)) < 0) {
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "can't open '%s': %s", name, strerror(errno));
+		free(name);
+		return (NULL);
+	}
+	if (fstat(fd, &st) < 0) {
+		close(fd);
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "stat error '%s': %s", name, strerror(errno));
+		free(name);
+		return (NULL);
+	}
 
-    if (archsw.arch_loadaddr != NULL)
-	loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr);
-    if (loadaddr == 0) {
-	close(fd);
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "no memory to load %s", name);
-	free(name);
-	return(NULL);
-    }
+	if (archsw.arch_loadaddr != NULL)
+		loadaddr = archsw.arch_loadaddr(LOAD_RAW, name, loadaddr);
+	if (loadaddr == 0) {
+		close(fd);
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "no memory to load %s", name);
+		free(name);
+		return (NULL);
+	}
 
-    laddr = loadaddr;
-    for (;;) {
-	/* read in 4k chunks; size is not really important */
-	got = archsw.arch_readin(fd, laddr, 4096);
-	if (got == 0)				/* end of file */
-	    break;
-	if (got < 0) {				/* error */
-	    snprintf(command_errbuf, sizeof (command_errbuf),
-		"error reading '%s': %s", name, strerror(errno));
-	    free(name);
-	    close(fd);
-	    if (archsw.arch_free_loadaddr != NULL)
-		archsw.arch_free_loadaddr(loadaddr,
-		    (uint64_t)(roundup2(st.st_size, PAGE_SIZE) >> 12));
-	    return(NULL);
+	laddr = loadaddr;
+	for (;;) {
+		/* read in 4k chunks; size is not really important */
+		got = archsw.arch_readin(fd, laddr, 4096);
+		if (got == 0)			/* end of file */
+			break;
+		if (got < 0) {			/* error */
+			snprintf(command_errbuf, sizeof (command_errbuf),
+			    "error reading '%s': %s", name, strerror(errno));
+			free(name);
+			close(fd);
+			if (archsw.arch_free_loadaddr != NULL) {
+				archsw.arch_free_loadaddr(loadaddr,
+				    (uint64_t)
+				    (roundup2(st.st_size, PAGE_SIZE) >> 12));
+			}
+			return (NULL);
+		}
+		laddr += got;
 	}
-	laddr += got;
-    }
 
-    /* Looks OK so far; create & populate control structure */
-    fp = file_alloc();
-    if (fp == NULL) {
-	if (archsw.arch_free_loadaddr != NULL)
-	    archsw.arch_free_loadaddr(loadaddr,
-		(uint64_t)(roundup2(st.st_size, PAGE_SIZE) >> 12));
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "no memory to load %s", name);
-	free(name);
+	/* Looks OK so far; create & populate control structure */
+	fp = file_alloc();
+	if (fp == NULL) {
+		if (archsw.arch_free_loadaddr != NULL)
+			archsw.arch_free_loadaddr(loadaddr,
+			    (uint64_t)(roundup2(st.st_size, PAGE_SIZE) >> 12));
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "no memory to load %s", name);
+		free(name);
+		close(fd);
+		return (NULL);
+	}
+
+	fp->f_name = name;
+	fp->f_args = unargv(argc, argv);
+	fp->f_type = strdup(type);
+	fp->f_metadata = NULL;
+	fp->f_loader = -1;
+	fp->f_addr = loadaddr;
+	fp->f_size = laddr - loadaddr;
+
+	if (fp->f_type == NULL ||
+	    (argc != 0 && fp->f_args == NULL)) {
+		close(fd);
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "no memory to load %s", name);
+		file_discard(fp);
+		return (NULL);
+	}
+	/* recognise space consumption */
+	loadaddr = laddr;
+
+	/* Add to the list of loaded files */
+	if (insert != 0)
+		file_insert_tail(fp);
 	close(fd);
-	return (NULL);
-    }
-    fp->f_name = name;
-    fp->f_args = unargv(argc, argv);
-    fp->f_type = strdup(type);
-    fp->f_metadata = NULL;
-    fp->f_loader = -1;
-    fp->f_addr = loadaddr;
-    fp->f_size = laddr - loadaddr;
-
-    if (fp->f_type == NULL ||
-        (argc != 0 && fp->f_args == NULL)) {
-	close(fd);
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "no memory to load %s", name);
-	file_discard(fp);
-	return (NULL);
-    }
-    /* recognise space consumption */
-    loadaddr = laddr;
-
-    /* Add to the list of loaded files */
-    if (insert != 0)
-	file_insert_tail(fp);
-    close(fd);
-    return(fp);
+	return (fp);
 }
 
 /*
@@ -751,33 +726,34 @@
 int
 mod_load(char *modname, struct mod_depend *verinfo, int argc, char *argv[])
 {
-    struct kernel_module	*mp;
-    int				err;
-    char			*filename;
+	struct kernel_module *mp;
+	int err;
+	char *filename;
 
-    if (file_havepath(modname)) {
-	printf("Warning: mod_load() called instead of mod_loadkld() for module '%s'\n", modname);
-	return (mod_loadkld(modname, argc, argv));
-    }
-    /* see if module is already loaded */
-    mp = file_findmodule(NULL, modname, verinfo);
-    if (mp) {
-	free(mp->m_args);
-	mp->m_args = unargv(argc, argv);
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "warning: module '%s' already loaded", mp->m_name);
-	return (0);
-    }
-    /* locate file with the module on the search path */
-    filename = mod_searchmodule(modname, verinfo);
-    if (filename == NULL) {
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "can't find '%s'", modname);
-	return (ENOENT);
-    }
-    err = mod_loadkld(filename, argc, argv);
-    free(filename);
-    return (err);
+	if (file_havepath(modname)) {
+		printf("Warning: mod_load() called instead of mod_loadkld() "
+		    "for module '%s'\n", modname);
+		return (mod_loadkld(modname, argc, argv));
+	}
+	/* see if module is already loaded */
+	mp = file_findmodule(NULL, modname, verinfo);
+	if (mp != NULL) {
+		free(mp->m_args);
+		mp->m_args = unargv(argc, argv);
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "warning: module '%s' already loaded", mp->m_name);
+		return (0);
+	}
+	/* locate file with the module on the search path */
+	filename = mod_searchmodule(modname, verinfo);
+	if (filename == NULL) {
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "can't find '%s'", modname);
+		return (ENOENT);
+	}
+	err = mod_loadkld(filename, argc, argv);
+	free(filename);
+	return (err);
 }
 
 /*
@@ -787,57 +763,57 @@
 int
 mod_loadkld(const char *kldname, int argc, char *argv[])
 {
-    struct preloaded_file	*fp, *last_file;
-    int				err;
-    char			*filename;
+	struct preloaded_file *fp, *last_file;
+	int err;
+	char *filename;
 
-    /*
-     * Get fully qualified KLD name
-     */
-    filename = file_search(kldname, kld_ext_list);
-    if (filename == NULL) {
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "can't find '%s'", kldname);
-	return (ENOENT);
-    }
-    /*
-     * Check if KLD already loaded
-     */
-    fp = file_findfile(filename, NULL);
-    if (fp) {
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "warning: KLD '%s' already loaded", filename);
+	/*
+	 * Get fully qualified KLD name
+	 */
+	filename = file_search(kldname, kld_ext_list);
+	if (filename == NULL) {
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "can't find '%s'", kldname);
+		return (ENOENT);
+	}
+	/*
+	 * Check if KLD already loaded
+	 */
+	fp = file_findfile(filename, NULL);
+	if (fp != NULL) {
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "warning: KLD '%s' already loaded", filename);
+		free(filename);
+		return (0);
+	}
+	for (last_file = preloaded_files;
+	    last_file != NULL && last_file->f_next != NULL;
+	    last_file = last_file->f_next)
+		;
+
+	do {
+		err = file_load(filename, loadaddr, &fp);
+		if (err)
+			break;
+		fp->f_args = unargv(argc, argv);
+		loadaddr = fp->f_addr + fp->f_size;
+		file_insert_tail(fp);	/* Add to the list of loaded files */
+		if (file_load_dependencies(fp) != 0) {
+			err = ENOENT;
+			last_file->f_next = NULL;
+			loadaddr = last_file->f_addr + last_file->f_size;
+			fp = NULL;
+			break;
+		}
+	} while (0);
+	if (err == EFTYPE) {
+		snprintf(command_errbuf, sizeof (command_errbuf),
+		    "don't know how to load module '%s'", filename);
+	}
+	if (err)
+		file_discard(fp);
 	free(filename);
-	return (0);
-    }
-    for (last_file = preloaded_files;
-	 last_file != NULL && last_file->f_next != NULL;
-	 last_file = last_file->f_next)
-	;
-
-    do {
-	err = file_load(filename, loadaddr, &fp);
-	if (err)
-	    break;
-	fp->f_args = unargv(argc, argv);
-	loadaddr = fp->f_addr + fp->f_size;
-	file_insert_tail(fp);		/* Add to the list of loaded files */
-	if (file_load_dependencies(fp) != 0) {
-	    err = ENOENT;
-	    last_file->f_next = NULL;
-	    loadaddr = last_file->f_addr + last_file->f_size;
-	    fp = NULL;
-	    break;
-	}
-    } while(0);
-    if (err == EFTYPE) {
-	snprintf(command_errbuf, sizeof (command_errbuf),
-	    "don't know how to load module '%s'", filename);
-    }
-    if (err)
-	file_discard(fp);
-    free(filename);
-    return (err);
+	return (err);
 }
 
 /*
@@ -847,14 +823,14 @@
 struct preloaded_file *
 file_findfile(const char *name, const char *type)
 {
-    struct preloaded_file *fp;
+	struct preloaded_file *fp;
 
-    for (fp = preloaded_files; fp != NULL; fp = fp->f_next) {
-	if (((name == NULL) || !strcmp(name, fp->f_name)) &&
-	    ((type == NULL) || !strcmp(type, fp->f_type)))
-	    break;
-    }
-    return (fp);
+	for (fp = preloaded_files; fp != NULL; fp = fp->f_next) {
+		if (((name == NULL) || strcmp(name, fp->f_name) == 0) &&
+		    ((type == NULL) || strcmp(type, fp->f_type) == 0))
+			break;
+	}
+	return (fp);
 }
 
 /*
@@ -863,37 +839,37 @@
  */
 struct kernel_module *
 file_findmodule(struct preloaded_file *fp, char *modname,
-	struct mod_depend *verinfo)
+    struct mod_depend *verinfo)
 {
-    struct kernel_module *mp, *best;
-    int bestver, mver;
+	struct kernel_module *mp, *best;
+	int bestver, mver;
 
-    if (fp == NULL) {
-	for (fp = preloaded_files; fp; fp = fp->f_next) {
-	    mp = file_findmodule(fp, modname, verinfo);
-	    if (mp)
-		return (mp);
+	if (fp == NULL) {
+		for (fp = preloaded_files; fp; fp = fp->f_next) {
+			mp = file_findmodule(fp, modname, verinfo);
+			if (mp != NULL)
+				return (mp);
+		}
+		return (NULL);
 	}
-	return (NULL);
-    }
-    best = NULL;
-    bestver = 0;
-    for (mp = fp->f_modules; mp; mp = mp->m_next) {
-        if (strcmp(modname, mp->m_name) == 0) {
-	    if (verinfo == NULL)
-		return (mp);
-	    mver = mp->m_version;
-	    if (mver == verinfo->md_ver_preferred)
-		return (mp);
-	    if (mver >= verinfo->md_ver_minimum &&
-		mver <= verinfo->md_ver_maximum &&
-		mver > bestver) {
-		best = mp;
-		bestver = mver;
-	    }
+	best = NULL;
+	bestver = 0;
+	for (mp = fp->f_modules; mp; mp = mp->m_next) {
+		if (strcmp(modname, mp->m_name) == 0) {
+			if (verinfo == NULL)
+				return (mp);
+			mver = mp->m_version;
+			if (mver == verinfo->md_ver_preferred)
+				return (mp);
+			if (mver >= verinfo->md_ver_minimum &&
+			    mver <= verinfo->md_ver_maximum &&
+			    mver > bestver) {
+				best = mp;
+				bestver = mver;
+			}
+		}
 	}
-    }
-    return (best);
+	return (best);
 }
 /*
  * Make a copy of (size) bytes of data from (p), and associate them as
@@ -921,23 +897,24 @@
 struct file_metadata *
 file_findmetadata(struct preloaded_file *fp, int type)
 {
-    struct file_metadata *md;
+	struct file_metadata *md;
 
-    for (md = fp->f_metadata; md != NULL; md = md->md_next)
-	if (md->md_type == type)
-	    break;
-    return(md);
+	for (md = fp->f_metadata; md != NULL; md = md->md_next)
+		if (md->md_type == type)
+			break;
+	return (md);
 }
 
 struct file_metadata *
 metadata_next(struct file_metadata *md, int type)
 {
-    if (md == NULL)
-	return (NULL);
-    while((md = md->md_next) != NULL)
-	if (md->md_type == type)
-	    break;
-    return (md);
+
+	if (md == NULL)
+		return (NULL);
+	while ((md = md->md_next) != NULL)
+		if (md->md_type == type)
+			break;
+	return (md);
 }
 
 static const char *emptyextlist[] = { "", NULL };
@@ -946,38 +923,39 @@
  * Check if the given file is in place and return full path to it.
  */
 static char *
-file_lookup(const char *path, const char *name, int namelen, const char **extlist)
+file_lookup(const char *path, const char *name, int namelen,
+    const char **extlist)
 {
-    struct stat	st;
-    char	*result, *cp;
-    const char **cpp;
-    int		pathlen, extlen, len;
+	struct stat st;
+	char *result, *cp;
+	const char **cpp;
+	int pathlen, extlen, len;
 
-    pathlen = strlen(path);
-    extlen = 0;
-    if (extlist == NULL)
-	extlist = emptyextlist;
-    for (cpp = extlist; *cpp; cpp++) {
-	len = strlen(*cpp);
-	if (len > extlen)
-	    extlen = len;
-    }
-    result = malloc(pathlen + namelen + extlen + 2);
-    if (result == NULL)
+	pathlen = strlen(path);
+	extlen = 0;
+	if (extlist == NULL)
+		extlist = emptyextlist;
+	for (cpp = extlist; *cpp; cpp++) {
+		len = strlen(*cpp);
+		if (len > extlen)
+			extlen = len;
+	}
+	result = malloc(pathlen + namelen + extlen + 2);
+	if (result == NULL)
+		return (NULL);
+	bcopy(path, result, pathlen);
+	if (pathlen > 0 && result[pathlen - 1] != '/')
+		result[pathlen++] = '/';
+	cp = result + pathlen;
+	bcopy(name, cp, namelen);
+	cp += namelen;
+	for (cpp = extlist; *cpp; cpp++) {
+		strcpy(cp, *cpp);
+		if (stat(result, &st) == 0 && S_ISREG(st.st_mode))
+			return (result);
+	}
+	free(result);
 	return (NULL);
-    bcopy(path, result, pathlen);
-    if (pathlen > 0 && result[pathlen - 1] != '/')
-	result[pathlen++] = '/';
-    cp = result + pathlen;
-    bcopy(name, cp, namelen);
-    cp += namelen;
-    for (cpp = extlist; *cpp; cpp++) {
-	strcpy(cp, *cpp);
-	if (stat(result, &st) == 0 && S_ISREG(st.st_mode))
-	    return result;
-    }
-    free(result);
-    return NULL;
 }
 
 /*
@@ -986,10 +964,10 @@
 static int
 file_havepath(const char *name)
 {
-    const char		*cp;
+	const char *cp;
 
-    archsw.arch_getdev(NULL, name, &cp);
-    return (cp != name || strchr(name, '/') != NULL);
+	archsw.arch_getdev(NULL, name, &cp);
+	return (cp != name || strchr(name, '/') != NULL);
 }
 
 /*
@@ -1005,104 +983,108 @@
 static char *
 file_search(const char *name, const char **extlist)
 {
-    struct moduledir	*mdp;
-    struct stat		sb;
-    char		*result;
-    int			namelen;
+	struct moduledir *mdp;
+	struct stat sb;
+	char *result;
+	int namelen;
 
-    /* Don't look for nothing */
-    if (name == NULL)
-	return(NULL);
+	/* Don't look for nothing */
+	if (name == NULL)
+		return (NULL);
 
-    if (*name == 0)
-	return(strdup(name));
+	if (*name == '\0')
+		return (strdup(name));
 
-    if (file_havepath(name)) {
-	/* Qualified, so just see if it exists */
-	if (stat(name, &sb) == 0)
-	    return(strdup(name));
-	return(NULL);
-    }
-    moduledir_rebuild();
-    result = NULL;
-    namelen = strlen(name);
-    STAILQ_FOREACH(mdp, &moduledir_list, d_link) {
-	result = file_lookup(mdp->d_path, name, namelen, extlist);
-	if (result)
-	    break;
-    }
-    return(result);
+	if (file_havepath(name)) {
+		/* Qualified, so just see if it exists */
+		if (stat(name, &sb) == 0)
+			return (strdup(name));
+		return (NULL);
+	}
+	moduledir_rebuild();
+	result = NULL;
+	namelen = strlen(name);
+	STAILQ_FOREACH(mdp, &moduledir_list, d_link) {
+		result = file_lookup(mdp->d_path, name, namelen, extlist);
+		if (result != NULL)
+			break;
+	}
+	return (result);
 }
 
 #define	INT_ALIGN(base, ptr)	ptr = \
-	(base) + (((ptr) - (base) + sizeof(int) - 1) & ~(sizeof(int) - 1))
+	(base) + (((ptr) - (base) + sizeof (int) - 1) & ~(sizeof (int) - 1))
 
 static char *
 mod_search_hints(struct moduledir *mdp, const char *modname,
-	struct mod_depend *verinfo)
+    struct mod_depend *verinfo)
 {
-    u_char	*cp, *recptr, *bufend, *best;
-    char	*result;
-    int		*intp, bestver, blen, clen, found, ival, modnamelen, reclen;
+	uchar_t *cp, *recptr, *bufend, *best;
+	char *result;
+	int *intp, bestver, blen, clen, ival, modnamelen, reclen;
+	bool found;
 
-    moduledir_readhints(mdp);
-    modnamelen = strlen(modname);
-    found = 0;
-    result = NULL;
-    bestver = 0;
-    if (mdp->d_hints == NULL)
-	goto bad;
-    recptr = mdp->d_hints;
-    bufend = recptr + mdp->d_hintsz;
-    clen = blen = 0;
-    best = cp = NULL;
-    while (recptr < bufend && !found) {
-	intp = (int*)recptr;
-	reclen = *intp++;
-	ival = *intp++;
-	cp = (u_char*)intp;
-	switch (ival) {
-	case MDT_VERSION:
-	    clen = *cp++;
-	    if (clen != modnamelen || bcmp(cp, modname, clen) != 0)
-		break;
-	    cp += clen;
-	    INT_ALIGN(mdp->d_hints, cp);
-	    ival = *(int*)cp;
-	    cp += sizeof(int);
-	    clen = *cp++;
-	    if (verinfo == NULL || ival == verinfo->md_ver_preferred) {
-		found = 1;
-		break;
-	    }
-	    if (ival >= verinfo->md_ver_minimum &&
-		ival <= verinfo->md_ver_maximum &&
-		ival > bestver) {
-		bestver = ival;
-		best = cp;
-		blen = clen;
-	    }
-	    break;
-	default:
-	    break;
+	moduledir_readhints(mdp);
+	modnamelen = strlen(modname);
+	found = false;
+	result = NULL;
+	bestver = 0;
+	if (mdp->d_hints == NULL)
+		goto bad;
+	recptr = mdp->d_hints;
+	bufend = recptr + mdp->d_hintsz;
+	clen = blen = 0;
+	best = cp = NULL;
+	while (recptr < bufend && !found) {
+		intp = (int *)recptr;
+		reclen = *intp++;
+		ival = *intp++;
+		cp = (uchar_t *)intp;
+		switch (ival) {
+		case MDT_VERSION:
+			clen = *cp++;
+			if (clen != modnamelen || bcmp(cp, modname, clen) != 0)
+				break;
+			cp += clen;
+			INT_ALIGN(mdp->d_hints, cp);
+			ival = *(int *)cp;
+			cp += sizeof (int);
+			clen = *cp++;
+			if (verinfo == NULL ||
+			    ival == verinfo->md_ver_preferred) {
+				found = true;
+				break;
+			}
+			if (ival >= verinfo->md_ver_minimum &&
+			    ival <= verinfo->md_ver_maximum &&
+			    ival > bestver) {
+				bestver = ival;
+				best = cp;
+				blen = clen;
+			}
+			break;
+		default:
+			break;
+		}
+		recptr += reclen + sizeof (int);
 	}
-	recptr += reclen + sizeof(int);
-    }
-    /*
-     * Finally check if KLD is in the place
-     */
-    if (found)
-	result = file_lookup(mdp->d_path, (char *)cp, clen, NULL);
-    else if (best)
-	result = file_lookup(mdp->d_path, (char *)best, blen, NULL);
+	/*
+	 * Finally check if KLD is in the place
+	 */
+	if (found)
+		result = file_lookup(mdp->d_path, (char *)cp, clen, NULL);
+	else if (best)
+		result = file_lookup(mdp->d_path, (char *)best, blen, NULL);
 bad:
-    /*
-     * If nothing found or hints is absent - fallback to the old way
-     * by using "kldname[.ko]" as module name.
-     */
-    if (!found && !bestver && result == NULL)
-	result = file_lookup(mdp->d_path, modname, modnamelen, kld_ext_list);
-    return result;
+	/*
+	 * If nothing found or hints is absent - fallback to the old way
+	 * by using "kldname[.ko]" as module name.
+	 */
+	if (!found && bestver == 0 && result == NULL) {
+		result = file_lookup(mdp->d_path, modname, modnamelen,
+		    kld_ext_list);
+	}
+	return (result);
 }
 
 /*
@@ -1111,50 +1093,50 @@
 static char *
 mod_searchmodule(char *name, struct mod_depend *verinfo)
 {
-    struct	moduledir *mdp;
-    char	*result;
+	struct moduledir *mdp;
+	char *result;
 
-    moduledir_rebuild();
-    /*
-     * Now we ready to lookup module in the given directories
-     */
-    result = NULL;
-    STAILQ_FOREACH(mdp, &moduledir_list, d_link) {
-	result = mod_search_hints(mdp, name, verinfo);
-	if (result)
-	    break;
-    }
+	moduledir_rebuild();
+	/*
+	 * Now we ready to lookup module in the given directories
+	 */
+	result = NULL;
+	STAILQ_FOREACH(mdp, &moduledir_list, d_link) {
+		result = mod_search_hints(mdp, name, verinfo);
+		if (result != NULL)
+			break;
+	}
 
-    return(result);
+	return (result);
 }
 
 int
 file_addmodule(struct preloaded_file *fp, char *modname, int version,
-	struct kernel_module **newmp)
+    struct kernel_module **newmp)
 {
-    struct kernel_module *mp;
-    struct mod_depend mdepend;
+	struct kernel_module *mp;
+	struct mod_depend mdepend;
 
-    bzero(&mdepend, sizeof(mdepend));
-    mdepend.md_ver_preferred = version;
-    mp = file_findmodule(fp, modname, &mdepend);
-    if (mp)
-	return (EEXIST);
-    mp = calloc(1, sizeof(struct kernel_module));
-    if (mp == NULL)
-	return (ENOMEM);
-    mp->m_name = strdup(modname);
-    if (mp->m_name == NULL) {
-	free(mp);
-	return (ENOMEM);
-    }
-    mp->m_version = version;
-    mp->m_fp = fp;
-    mp->m_next = fp->f_modules;
-    fp->f_modules = mp;
-    if (newmp)
-	*newmp = mp;
-    return (0);
+	bzero(&mdepend, sizeof (mdepend));
+	mdepend.md_ver_preferred = version;
+	mp = file_findmodule(fp, modname, &mdepend);
+	if (mp != NULL)
+		return (EEXIST);
+	mp = calloc(1, sizeof (struct kernel_module));
+	if (mp == NULL)
+		return (ENOMEM);
+	mp->m_name = strdup(modname);
+	if (mp->m_name == NULL) {
+		free(mp);
+		return (ENOMEM);
+	}
+	mp->m_version = version;
+	mp->m_fp = fp;
+	mp->m_next = fp->f_modules;
+	fp->f_modules = mp;
+	if (newmp)
+		*newmp = mp;
+	return (0);
 }
 
 /*
@@ -1163,32 +1145,34 @@
 void
 file_discard(struct preloaded_file *fp)
 {
-    struct file_metadata	*md, *md1;
-    struct kernel_module	*mp, *mp1;
-    if (fp == NULL)
-	return;
+	struct file_metadata *md, *md1;
+	struct kernel_module *mp, *mp1;
 
-    if (archsw.arch_free_loadaddr != NULL && fp->f_addr)
-	archsw.arch_free_loadaddr(fp->f_addr,
-	    (uint64_t)(roundup2(fp->f_size, PAGE_SIZE) >> 12));
+	if (fp == NULL)
+		return;
+
+	if (archsw.arch_free_loadaddr != NULL && fp->f_addr) {
+		archsw.arch_free_loadaddr(fp->f_addr,
+		    (uint64_t)(roundup2(fp->f_size, PAGE_SIZE) >> 12));
+	}
 
-    md = fp->f_metadata;
-    while (md) {
-	md1 = md;
-	md = md->md_next;
-	free(md1);
-    }
-    mp = fp->f_modules;
-    while (mp) {
-	free(mp->m_name);
-	mp1 = mp;
-	mp = mp->m_next;
-	free(mp1);
-    }
-    free(fp->f_name);
-    free(fp->f_type);
-    free(fp->f_args);
-    free(fp);
+	md = fp->f_metadata;
+	while (md != NULL) {
+		md1 = md;
+		md = md->md_next;
+		free(md1);
+	}
+	mp = fp->f_modules;
+	while (mp != NULL) {
+		free(mp->m_name);
+		mp1 = mp;
+		mp = mp->m_next;
+		free(mp1);
+	}
+	free(fp->f_name);
+	free(fp->f_type);
+	free(fp->f_args);
+	free(fp);
 }
 
 /*
@@ -1199,7 +1183,7 @@
 file_alloc(void)
 {
 
-    return (calloc(1, sizeof (struct preloaded_file)));
+	return (calloc(1, sizeof (struct preloaded_file)));
 }
 
 /*
@@ -1208,31 +1192,31 @@
 static void
 file_insert_tail(struct preloaded_file *fp)
 {
-    struct preloaded_file	*cm;
+	struct preloaded_file *cm;
 
-    /* Append to list of loaded file */
-    fp->f_next = NULL;
-    if (preloaded_files == NULL) {
-	preloaded_files = fp;
-    } else {
-	for (cm = preloaded_files; cm->f_next != NULL; cm = cm->f_next)
-	    ;
-	cm->f_next = fp;
-    }
+	/* Append to list of loaded file */
+	fp->f_next = NULL;
+	if (preloaded_files == NULL) {
+		preloaded_files = fp;
+	} else {
+		for (cm = preloaded_files; cm->f_next != NULL; cm = cm->f_next)
+			;
+		cm->f_next = fp;
+	}
 }
 
 static char *
 moduledir_fullpath(struct moduledir *mdp, const char *fname)
 {
-    char *cp;
+	char *cp;
 
-    cp = malloc(strlen(mdp->d_path) + strlen(fname) + 2);
-    if (cp == NULL)
-	return NULL;
-    strcpy(cp, mdp->d_path);
-    strcat(cp, "/");
-    strcat(cp, fname);
-    return (cp);
+	cp = malloc(strlen(mdp->d_path) + strlen(fname) + 2);
+	if (cp == NULL)
+		return (NULL);
+	strcpy(cp, mdp->d_path);
+	strcat(cp, "/");
+	strcat(cp, fname);
+	return (cp);
 }
 
 /*
@@ -1241,39 +1225,39 @@
 static void
 moduledir_readhints(struct moduledir *mdp)
 {
-    struct stat	st;
-    char	*path;
-    int		fd, size, version;
+	struct stat st;
+	char *path;
+	int fd, size, version;
 
-    if (mdp->d_hints != NULL || (mdp->d_flags & MDIR_NOHINTS))
-	return;
-    path = moduledir_fullpath(mdp, "linker.hints");
-    if (stat(path, &st) != 0 ||
-	st.st_size < (ssize_t)(sizeof(version) + sizeof(int)) ||
-	st.st_size > LINKER_HINTS_MAX || (fd = open(path, O_RDONLY)) < 0) {
+	if (mdp->d_hints != NULL || (mdp->d_flags & MDIR_NOHINTS))
+		return;
+	path = moduledir_fullpath(mdp, "linker.hints");
+	if (stat(path, &st) != 0 ||
+	    st.st_size < (ssize_t)(sizeof (version) + sizeof (int)) ||
+	    st.st_size > LINKER_HINTS_MAX ||
+	    (fd = open(path, O_RDONLY)) < 0) {
+		free(path);
+		mdp->d_flags |= MDIR_NOHINTS;
+		return;
+	}
 	free(path);
-	mdp->d_flags |= MDIR_NOHINTS;
+	size = read(fd, &version, sizeof (version));
+	if (size != sizeof (version) || version != LINKER_HINTS_VERSION)
+		goto bad;
+	size = st.st_size - size;
+	mdp->d_hints = malloc(size);
+	if (mdp->d_hints == NULL)
+		goto bad;
+	if (read(fd, mdp->d_hints, size) != size)
+		goto bad;
+	mdp->d_hintsz = size;
+	close(fd);
 	return;
-    }
-    free(path);
-    size = read(fd, &version, sizeof(version));
-    if (size != sizeof(version) || version != LINKER_HINTS_VERSION)
-	goto bad;
-    size = st.st_size - size;
-    mdp->d_hints = malloc(size);
-    if (mdp->d_hints == NULL)
-	goto bad;
-    if (read(fd, mdp->d_hints, size) != size)
-	goto bad;
-    mdp->d_hintsz = size;
-    close(fd);
-    return;
 bad:
-    close(fd);
-    free(mdp->d_hints);
-    mdp->d_hints = NULL;
-    mdp->d_flags |= MDIR_NOHINTS;
-    return;
+	close(fd);
+	free(mdp->d_hints);
+	mdp->d_hints = NULL;
+	mdp->d_flags |= MDIR_NOHINTS;
 }
 
 /*
@@ -1282,62 +1266,63 @@
 static void
 moduledir_rebuild(void)
 {
-    struct	moduledir *mdp, *mtmp;
-    const char	*path, *cp, *ep;
-    size_t	cplen;
+	struct moduledir *mdp, *mtmp;
+	const char *path, *cp, *ep;
+	size_t cplen;
 
-    path = getenv("module_path");
-    if (path == NULL)
-	path = default_searchpath;
-    /*
-     * Rebuild list of module directories if it changed
-     */
-    STAILQ_FOREACH(mdp, &moduledir_list, d_link)
-	mdp->d_flags |= MDIR_REMOVED;
+	path = getenv("module_path");
+	if (path == NULL)
+		path = default_searchpath;
+	/*
+	 * Rebuild list of module directories if it changed
+	 */
+	STAILQ_FOREACH(mdp, &moduledir_list, d_link)
+		mdp->d_flags |= MDIR_REMOVED;
 
-    for (ep = path; *ep != 0;  ep++) {
-	cp = ep;
-	for (; *ep != 0 && *ep != ';'; ep++)
-	    ;
-	/*
-	 * Ignore trailing slashes
-	 */
-	for (cplen = ep - cp; cplen > 1 && cp[cplen - 1] == '/'; cplen--)
-	    ;
-	STAILQ_FOREACH(mdp, &moduledir_list, d_link) {
-	    if (strlen(mdp->d_path) != cplen ||	bcmp(cp, mdp->d_path, cplen) != 0)
-		continue;
-	    mdp->d_flags &= ~MDIR_REMOVED;
-	    break;
+	for (ep = path; *ep != 0; ep++) {
+		cp = ep;
+		for (; *ep != 0 && *ep != ';'; ep++)
+			;
+		/*
+		 * Ignore trailing slashes
+		 */
+		for (cplen = ep - cp; cplen > 1 && cp[cplen - 1] == '/';
+		    cplen--)
+			;
+		STAILQ_FOREACH(mdp, &moduledir_list, d_link) {
+			if (strlen(mdp->d_path) != cplen ||
+			    bcmp(cp, mdp->d_path, cplen) != 0)
+				continue;
+			mdp->d_flags &= ~MDIR_REMOVED;
+			break;
+		}
+		if (mdp == NULL) {
+			mdp = malloc(sizeof (*mdp) + cplen + 1);
+			if (mdp == NULL)
+				return;
+			mdp->d_path = (char *)(mdp + 1);
+			bcopy(cp, mdp->d_path, cplen);
+			mdp->d_path[cplen] = 0;
+			mdp->d_hints = NULL;
+			mdp->d_flags = 0;
+			STAILQ_INSERT_TAIL(&moduledir_list, mdp, d_link);
+		}
+		if (*ep == '\0')
+			break;
 	}
-	if (mdp == NULL) {
-	    mdp = malloc(sizeof(*mdp) + cplen + 1);
-	    if (mdp == NULL)
-		return;
-	    mdp->d_path = (char*)(mdp + 1);
-	    bcopy(cp, mdp->d_path, cplen);
-	    mdp->d_path[cplen] = 0;
-	    mdp->d_hints = NULL;
-	    mdp->d_flags = 0;
-	    STAILQ_INSERT_TAIL(&moduledir_list, mdp, d_link);
+	/*
+	 * Delete unused directories if any
+	 */
+	mdp = STAILQ_FIRST(&moduledir_list);
+	while (mdp) {
+		if ((mdp->d_flags & MDIR_REMOVED) == 0) {
+			mdp = STAILQ_NEXT(mdp, d_link);
+		} else {
+			free(mdp->d_hints);
+			mtmp = mdp;
+			mdp = STAILQ_NEXT(mdp, d_link);
+			STAILQ_REMOVE(&moduledir_list, mtmp, moduledir, d_link);
+			free(mtmp);
+		}
 	}
-	if (*ep == 0)
-	    break;
-    }
-    /*
-     * Delete unused directories if any
-     */
-    mdp = STAILQ_FIRST(&moduledir_list);
-    while (mdp) {
-	if ((mdp->d_flags & MDIR_REMOVED) == 0) {
-	    mdp = STAILQ_NEXT(mdp, d_link);
-	} else {
-	    free(mdp->d_hints);
-	    mtmp = mdp;
-	    mdp = STAILQ_NEXT(mdp, d_link);
-	    STAILQ_REMOVE(&moduledir_list, mtmp, moduledir, d_link);
-	    free(mtmp);
-	}
-    }
-    return;
 }

--- a/usr/src/cmd/Makefile	Wed May 29 18:07:38 2019 +0200
+++ b/usr/src/cmd/Makefile	Fri May 31 14:32:40 2019 +0200
@@ -497,7 +497,6 @@
 	xvm
 
 sparc_SUBDIRS=		\
-	cvcd		\
 	dcs		\
 	device_remap	\
 	drd		\

--- a/usr/src/cmd/Makefile.check	Wed May 29 18:07:38 2019 +0200
+++ b/usr/src/cmd/Makefile.check	Fri May 31 14:32:40 2019 +0200
@@ -24,6 +24,7 @@
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright (c) 2011, 2017 by Delphix. All rights reserved.
 # Copyright 2017 Nexenta Systems, Inc.
+# Copyright 2019 Peter Tribble
 #
 
 include ../Makefile.master
@@ -39,7 +40,6 @@
 	consadm				\
 	coreadm				\
 	cron				\
-	cvcd				\
 	dispadmin			\
 	drd				\
 	dumpadm				\

--- a/usr/src/cmd/cvcd/Makefile	Wed May 29 18:07:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# Copyright 2019 Peter Tribble.
-#
-# Makefile definitions for Starcat Network Console related items.
-#
-# cmd/cvcd/Makefile
-#
-# These utilities are specific to the Sun-Fire-15000 platform at this
-# time.
-#
-
-PROG=		cvcd
-MANIFEST=	cvc.xml
-SVCMETHOD=	svc-$(PROG)
-
-include ../Makefile.cmd
-
-SUBDIRS	=	sparc
-
-ROOTMANIFESTDIR=	$(ROOTSVCSYSTEM)
-
-all :=		TARGET= all
-install :=	TARGET= install
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-lint :=		TARGET= lint
-
-.KEEP_STATE:
-
-all lint clean clobber: $(SUBDIRS)
-
-install: $(SUBDIRS) $(ROOTMANIFEST) $(ROOTSVCMETHOD)
-
-check:	$(CHKMANIFEST)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
-
-include ../Makefile.targ

--- a/usr/src/cmd/cvcd/cvc.xml	Wed May 29 18:07:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
- Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
- Copyright 2019 Peter Tribble.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-	NOTE:  This service manifest is not editable; its contents will
-	be overwritten by package or patch operations, including
-	operating system upgrade.  Make customizations in a different
-	file.
-
-	Service manifest for cvcd.
--->
-
-<service_bundle type='manifest' name='SUNWcvcr.u:cvcd'>
-
-<service name='system/cvc' type='service' version='1'>
-
-	<create_default_instance enabled='false' />
-
-	<single_instance />
-
-	<dependency
-	    name='network'
-	    grouping='require_all'
-	    restart_on='none'
-	    type='service'>
-		<service_fmri value='svc:/network/loopback' />
-	</dependency>
-
-	<!-- sckmd is required on OPL and Starcat -->
-	<dependency
-	    name='sckmd'
-	    grouping='optional_all'
-	    restart_on='none'
-	    type='service'>
-		<service_fmri value='svc:/platform/sun4u/sckmd' />
-	</dependency>
-
-	<dependency 
-	    name='cryptosvc'
-	    grouping='require_all'
-	    restart_on='none'
-	    type='service'>
-		<service_fmri value='svc:/system/cryptosvc' />
-	</dependency>
-
-	<dependency
-	    name='nodename'
-	    grouping='require_all'
-	    restart_on='none' 
-	    type='service'>
-		<service_fmri value='svc:/system/identity:node' />
-	</dependency>
-
-	<dependency
-	    name='filesystem_usr'
-	    grouping='require_all'
-	    restart_on='none' 
-	    type='service'>
-		<service_fmri value='svc:/system/filesystem/usr' />
-	</dependency>
-
-	<exec_method
-	    type='method'
-	    name='start'
-	    exec='/lib/svc/method/svc-cvcd'
-	    timeout_seconds='60' />
-
-	<exec_method
-	    type='method'
-	    name='stop'
-	    exec=':kill -9'
-	    timeout_seconds='60' />
-
-	<!-- these are passed to cvcd in the method script -->
-	<property_group name='cvc' type='application'>
-		<propval name='ah_auth' type='astring' value='md5' />
-		<propval name='esp_encr' type='astring' value='none' />
-		<propval name='esp_auth' type='astring' value='none' />
-	</property_group>
-
-	<stability value='Unstable' />
-
-	<template>
-		<common_name>
-			<loctext xml:lang='C'>
-				network virtual console
-			</loctext>
-		</common_name>
-
-		<documentation>
-			<manpage title='cvcd' section='1M'
-				manpath='/usr/share/man' />
-		</documentation>
-	</template>
-</service>
-
-</service_bundle>

--- a/usr/src/cmd/cvcd/sparc/Makefile	Wed May 29 18:07:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (c) 1997 by Sun Microsystems, Inc.
-# All rights reserved.
-# Copyright 2019 Peter Tribble.
-#
-# Makefile definitions for Starcat's Network Console related items.
-#
-# cmd/cvcd/sparc/Makefile
-#
-
-SUBDIRS	=	sun4u
-
-all :=		TARGET= all
-install :=	TARGET= install
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-lint :=		TARGET= lint
-
-.KEEP_STATE:
-
-all install lint clean clobber: $(SUBDIRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:

--- a/usr/src/cmd/cvcd/sparc/sun4u/Makefile	Wed May 29 18:07:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# Copyright 2019 Peter Tribble.
-#
-# Makefile definitions for Starcat Network Console related items.
-#
-# cmd/cvcd/sparc/sun4u/Makefile
-#
-
-SUBDIRS	=	starcat
-
-all :=		TARGET= all
-install :=	TARGET= install
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-lint :=		TARGET= lint
-
-.KEEP_STATE:
-
-all install lint clean clobber: $(SUBDIRS)
-
-$(SUBDIRS): FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:

--- a/usr/src/cmd/cvcd/sparc/sun4u/starcat/Makefile	Wed May 29 18:07:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# cmd/cvcd/sparc/sun4u/starcat/cvcd
-#
-PROG=		cvcd
-ROOTFS_PROG=	$(PROG)
-PLATFORM=	SUNW,Sun-Fire-15000
-
-#	Create default so empty rules don't confuse make
-CLASS=		32
-
-SRCS=		$(PROG:%=%.c)
-OBJS=		$(PROG:%=%.o)
-
-include ../../../../Makefile.cmd
-include ../../../../../Makefile.psm
-
-FILEMODE= 0755
-
-ROOTPSMPROG	= $(ROOT_PSM_LIB_DIR)/$(PROG)
-
-CPPFLAGS = -I$(USR_PSM_INCL_DIR) -I$(SRC)/uts/sun4u/starcat $(CPPFLAGS.master)
-CERRWARN += -_gcc=-Wno-unused-variable
-CERRWARN += -_gcc=-Wno-uninitialized
-
-LDLIBS +=	-lsocket
-
-.KEEP_STATE:
-
-all: $(ROOTFS_PROG) 
-
-install: all .WAIT $(ROOTPSMPROG)
-
-clean:
-	$(RM) $(PROG) $(OBJS)
-
-lint: lint_PROG
-
-include ../../../../Makefile.targ
-include ../../../../../Makefile.psm.targ

--- a/usr/src/cmd/cvcd/sparc/sun4u/starcat/cvcd.c	Wed May 29 18:07:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,888 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * This code implements the Starcat Virtual Console host daemon (see cvcd(1M)).
- * It accepts one TCP connection at a time on a well-known port.  Once a
- * connection is accepted, the console redirection driver (cvcdredir(7D)) is
- * opened, and console I/O is routed back and forth between the two file
- * descriptors (network and redirection driver).  Per-socket IPsec is used to
- * secure the connection if it is enabled with the "-a", "-u" and or "-e"
- * command line options.
- */
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <ctype.h>
-
-#include <fcntl.h>
-#include <sys/filio.h>		/* Just to get FIONBIO... */
-#include <unistd.h>
-#include <errno.h>
-#include <stropts.h>
-#include <signal.h>
-#include <syslog.h>
-#include <sys/utsname.h>
-#include <sys/stat.h>
-#include <locale.h>
-#include <limits.h>
-
-#include <sys/priocntl.h>
-#include <sys/tspriocntl.h>
-#include <sys/rtpriocntl.h>
-
-#include <netdb.h>
-#include <sys/socket.h>
-#include <tiuser.h>
-
-#include <sys/sc_cvcio.h>
-
-
-/*
- * Header files for per-socket IPsec
- */
-#include <netinet/in.h>
-#include <net/pfkeyv2.h>
-
-/*
- * The IPsec socket option struct, from ipsec(7P):
- *
- *     typedef struct ipsec_req {
- *         uint_t      ipsr_ah_req;            AH request
- *         uint_t      ipsr_esp_req;           ESP request
- *         uint_t      ipsr_self_encap_req;    Self-Encap request
- *         uint8_t     ipsr_auth_alg;          Auth algs for AH
- *         uint8_t     ipsr_esp_alg;           Encr algs for ESP
- *         uint8_t     ipsr_esp_auth_alg;      Auth algs for ESP
- *     } ipsec_req_t;
- *
- * The -a option sets the ipsr_auth_alg field. Allowable arguments
- * are "none", "md5", or "sha1". The -e option sets the ipsr_esp_alg
- * field. Allowable arguments are "none", "des", or "3des". "none"
- * is the default for both options. The -u option sets ipsr_esp_auth_alg.
- * Allowable arguments are the same as -a.
- *
- * The arguments ("md5", "des", etc.) are named so that they match
- * kmd(1m)'s accepted arguments which are listed on the SC in
- * /etc/opt/SUNWSMS/SMS/config/kmd_policy.cf.
- */
-#define	AH_REQ		(IPSEC_PREF_REQUIRED | IPSEC_PREF_UNIQUE)
-#define	ESP_REQ		(IPSEC_PREF_REQUIRED | IPSEC_PREF_UNIQUE)
-#define	SELF_ENCAP_REQ	0x0
-
-/*
- * A type to hold the command line argument string used to select a
- * particular authentication header (AH) or encapsulating security
- * payload (ESP) algorithm and the ID used for that algorithm when
- * filling the ipsec_req_t structure which is passed to
- * setsockopt(3SOCKET).
- */
-typedef struct cvcd_alg {
-	char		*arg_name;
-	uint8_t		alg_id;
-} cvcd_alg_t;
-
-/*
- *  Misc. defines.
- */
-#define	NODENAME	"/etc/nodename"
-#define	NETWORK_PFD	0
-#define	REDIR_PFD	1
-#define	LISTEN_PFD	2
-#define	NUM_PFDS	3
-
-/*
- * Function prototypes
- */
-static void cvcd_set_priority(void);
-static int  cvcd_init_host_socket(int port, uint8_t ah_auth_alg,
-    uint8_t esp_encr_alg, uint8_t esp_auth_alg);
-static void cvcd_do_network_console(void);
-static void cvcd_err(int code, char *format, ...);
-static void cvcd_usage(void);
-static uint8_t cvcd_get_alg(cvcd_alg_t *algs, char *arg);
-static boolean_t cvcd_global_policy(void);
-
-/*
- *  Globals
- */
-static struct pollfd	pfds[NUM_PFDS];
-static char		progname[MAXPATHLEN];
-static int		debug = 0;
-
-/*
- * Array of acceptable -a, -u and -e arguments.
- */
-static cvcd_alg_t auth_algs_array[] = {
-	{ "none",	SADB_AALG_NONE },	/* -a none or -u none */
-	{ "md5",	SADB_AALG_MD5HMAC },	/* -a md5  or -u md5 */
-	{ "sha1",	SADB_AALG_SHA1HMAC },	/* -a sha1 or -u sha1 */
-	{ NULL,		0x0 }
-}, esp_algs_array[] = {
-	{ "none",	SADB_EALG_NONE },	/* -e none */
-	{ "des",	SADB_EALG_DESCBC },	/* -e des  */
-	{ "3des",	SADB_EALG_3DESCBC },	/* -e 3des */
-	{ NULL,		0x0 }
-};
-
-
-int
-main(int argc, char **argv)
-{
-	int			err;
-	int			opt;
-	int			tport = 0;
-	char			*hostname;
-	struct utsname		utsname;
-	int			fd;
-	int			i;
-	struct servent		*se;
-	char 			prefix[256];
-	uint8_t			ah_auth_alg 	= SADB_AALG_NONE;
-	uint8_t			esp_encr_alg  	= SADB_EALG_NONE;
-	uint8_t			esp_auth_alg  	= SADB_AALG_NONE;
-
-	(void) setlocale(LC_ALL, "");
-	(void) strcpy(progname, argv[0]);
-
-#ifdef DEBUG
-	while ((opt = getopt(argc, argv, "a:e:u:dp:")) != EOF) {
-#else
-	while ((opt = getopt(argc, argv, "a:e:u:")) != EOF) {
-#endif
-		switch (opt) {
-			case 'a' :
-			case 'u' :
-					if (opt == 'a')
-						ah_auth_alg = cvcd_get_alg(
-						    auth_algs_array, optarg);
-					else
-						esp_auth_alg = cvcd_get_alg(
-						    auth_algs_array, optarg);
-					break;
-
-			case 'e' :	esp_encr_alg = cvcd_get_alg(
-					    esp_algs_array, optarg);
-					break;
-#ifdef DEBUG
-			case 'd' :	debug = 1;
-					break;
-
-			case 'p' :	tport = atoi(optarg);
-					break;
-#endif  /* DEBUG */
-
-			default  :	cvcd_usage();
-					exit(1);
-		}
-	}
-
-	if (uname(&utsname) == -1) {
-		perror("HOSTNAME not defined");
-		exit(1);
-	}
-	hostname = utsname.nodename;
-
-	/*
-	 * hostname may still be NULL, depends on when cvcd was started
-	 * in the boot sequence.  If it is NULL, try one more time
-	 * to get a hostname -> look in the /etc/nodename file.
-	 */
-	if (!strlen(hostname)) {
-		/*
-		 * try to get the hostname from the /etc/nodename file
-		 * we reuse the utsname.nodename buffer here!  hostname
-		 * already points to it.
-		 */
-		if ((fd = open(NODENAME, O_RDONLY)) > 0) {
-			if ((i = read(fd, utsname.nodename, SYS_NMLN)) <= 0) {
-				cvcd_err(LOG_WARNING,
-				    "failed to acquire hostname");
-			} else {
-				utsname.nodename[i-1] = '\0';
-			}
-			(void) close(fd);
-		}
-	}
-	/*
-	 * If all attempts to get the hostname have failed, put something
-	 * meaningful in the buffer.
-	 */
-	if (!strlen(hostname)) {
-		(void) strcpy(utsname.nodename, "(unknown)");
-	}
-
-	/*
-	 * Must be root.
-	 */
-	if (debug == 0 && geteuid() != 0) {
-		fprintf(stderr, "cvcd: Must be root");
-		exit(1);
-	}
-
-	/*
-	 * Daemonize...
-	 */
-	if (debug == 0) {
-		closefrom(0);
-		(void) chdir("/");
-		(void) umask(0);
-		if (fork() != 0) {
-			exit(0);
-		}
-		(void) setpgrp();
-		(void) sprintf(prefix, "%s-(HOSTNAME:%s)", progname, hostname);
-		openlog(prefix, LOG_CONS | LOG_NDELAY, LOG_LOCAL0);
-	}
-
-	/*
-	 * Initialize the array of pollfds used to track the listening socket,
-	 * the connection to the console redirection driver, and the network
-	 * connection.
-	 */
-	(void) memset((void *)pfds, 0, NUM_PFDS * sizeof (struct pollfd));
-	for (i = 0; i < NUM_PFDS; i++) {
-		pfds[i].fd = -1;
-	}
-
-	/* SPR 94004 */
-	(void) sigignore(SIGTERM);
-
-	/*
-	 * SPR 83644: cvc and kadb are not compatible under heavy loads.
-	 *	Fix: will give cvcd highest TS priority at execution time.
-	 */
-	cvcd_set_priority();
-
-	/*
-	 * If not already determined by a command-line flag, figure out which
-	 * port we're supposed to be listening on.
-	 */
-	if (tport == 0) {
-		if ((se = getservbyname(CVCD_SERVICE, "tcp")) == NULL) {
-			cvcd_err(LOG_ERR, "getservbyname(%s) not found",
-				CVCD_SERVICE);
-			exit(1);
-		}
-		tport = se->s_port;
-	}
-
-	if (debug == 1) {
-		cvcd_err(LOG_DEBUG, "tport = %d, debug = %d", tport, debug);
-	}
-
-	/*
-	 * Attempt to initialize the socket we'll use to listen for incoming
-	 * connections.  No need to check the return value, as the call will
-	 * exit if it fails.
-	 */
-	pfds[LISTEN_PFD].fd = cvcd_init_host_socket(tport, ah_auth_alg,
-	    esp_encr_alg, esp_auth_alg);
-
-	/*
-	 * Now that we're all set up, we loop forever waiting for connections
-	 * (one at a time) and then driving network console activity over them.
-	 */
-	for (;;) {
-		/*
-		 * Start by waiting for an incoming connection.
-		 */
-		do {
-			pfds[LISTEN_PFD].events = POLLIN;
-			err = poll(&(pfds[LISTEN_PFD]), 1, -1);
-			if (err == -1) {
-				cvcd_err(LOG_ERR, "poll: %s", strerror(errno));
-				exit(1);
-			}
-			if ((err > 0) &&
-			    (pfds[LISTEN_PFD].revents & POLLIN)) {
-				fd = accept(pfds[LISTEN_PFD].fd, NULL, NULL);
-				if ((fd == -1) && (errno != EWOULDBLOCK)) {
-					cvcd_err(LOG_ERR, "accept: %s",
-					    strerror(errno));
-					exit(1);
-				}
-			}
-		} while (fd == -1);
-
-		/*
-		 * We have a connection.  Set the new socket nonblocking, and
-		 * initialize the appropriate pollfd.  In theory, the new socket
-		 * is _already_ non-blocking because accept() is supposed to
-		 * hand us a socket with the same properties as the socket we're
-		 * listening on, but it won't hurt to make sure.
-		 */
-		opt = 1;
-		err = ioctl(fd, FIONBIO, &opt);
-		if (err == -1) {
-			cvcd_err(LOG_ERR, "ioctl: %s", strerror(errno));
-			(void) close(fd);
-			continue;
-		}
-		pfds[NETWORK_PFD].fd = fd;
-
-		/*
-		 * Since we're ready to do network console stuff, go ahead and
-		 * open the Network Console redirection driver, which will
-		 * switch traffic from the IOSRAM path to the network path if
-		 * the network path has been selected in cvc.
-		 */
-		fd = open(CVCREDIR_DEV, O_RDWR|O_NDELAY);
-		if (fd == -1) {
-			cvcd_err(LOG_ERR, "open(redir): %s", strerror(errno));
-			exit(1);
-		}
-		pfds[REDIR_PFD].fd = fd;
-
-		/*
-		 * We have a network connection and we have the redirection
-		 * driver open, so drive the network console until something
-		 * changes.
-		 */
-		cvcd_do_network_console();
-
-		/*
-		 * cvcd_do_network_console doesn't return until there's a
-		 * problem, so we need to close the network connection and the
-		 * redirection driver and start the whole loop over again.
-		 */
-		(void) close(pfds[NETWORK_PFD].fd);
-		pfds[NETWORK_PFD].fd = -1;
-		(void) close(pfds[REDIR_PFD].fd);
-		pfds[REDIR_PFD].fd = -1;
-	}
-
-	/* NOTREACHED */
-	return (1);
-}
-
-/*
- * cvcd_get_alg
- *
- * Returns the ID of the first algorithm found in
- * the 'algs' array with a name matching 'arg'. If
- * there is no matching algorithm, the function does
- * not return. The 'algs' array must be terminated
- * by an entry containing a NULL 'arg_name' field.
- */
-static uint8_t
-cvcd_get_alg(cvcd_alg_t *algs, char *arg)
-{
-	cvcd_alg_t *alg;
-
-	for (alg = algs; alg->arg_name != NULL && arg != NULL; alg++) {
-		if (strncmp(alg->arg_name, arg, strlen(alg->arg_name) + 1)
-		    == 0) {
-			return (alg->alg_id);
-		}
-	}
-
-	cvcd_usage();
-	exit(1);
-	/* NOTREACHED */
-}
-
-/*
- * cvcd_set_priority
- *
- * DESCRIBE
- * SPR 83644: cvc and kadb are not compatible under heavy loads.
- *	Fix: will give cvcd highest TS priority at execution time.
- */
-static void
-cvcd_set_priority(void)
-{
-	id_t		pid, tsID;
-	pcparms_t	pcparms;
-	tsparms_t	*tsparmsp;
-	short		tsmaxpri;
-	pcinfo_t	info;
-
-	pid = getpid();
-	pcparms.pc_cid = PC_CLNULL;
-	tsparmsp = (tsparms_t *)pcparms.pc_clparms;
-
-	/* Get scheduler properties for this PID */
-	if (priocntl(P_PID, pid, PC_GETPARMS, (caddr_t)&pcparms) == -1L) {
-		cvcd_err(LOG_ERR, "Warning: can't set priority.");
-		cvcd_err(LOG_ERR, "priocntl(GETPARMS): %s", strerror(errno));
-		return;
-	}
-
-	/* Get class ID and maximum priority for TS process class */
-	(void) strcpy(info.pc_clname, "TS");
-	if (priocntl(0L, 0L, PC_GETCID, (caddr_t)&info) == -1L) {
-		cvcd_err(LOG_ERR, "Warning: can't set priority.");
-		cvcd_err(LOG_ERR, "priocntl(GETCID): %s", strerror(errno));
-		return;
-	}
-	tsmaxpri = ((struct tsinfo *)info.pc_clinfo)->ts_maxupri;
-	tsID = info.pc_cid;
-
-	/* Print priority info in debug mode */
-	if (debug) {
-		if (pcparms.pc_cid == tsID) {
-			cvcd_err(LOG_DEBUG,
-			    "PID: %d, current priority: %d, Max priority: %d.",
-			    pid, tsparmsp->ts_upri, tsmaxpri);
-		}
-	}
-	/* Change proc's priority to maxtspri */
-	pcparms.pc_cid = tsID;
-	tsparmsp->ts_upri = tsmaxpri;
-	tsparmsp->ts_uprilim = tsmaxpri;
-
-	if (priocntl(P_PID, pid, PC_SETPARMS, (caddr_t)&pcparms) == -1L) {
-		cvcd_err(LOG_ERR, "Warning: can't set priority.");
-		cvcd_err(LOG_ERR, "priocntl(SETPARMS): %s", strerror(errno));
-	}
-
-	/* Print new priority info in debug mode */
-	if (debug) {
-		if (priocntl(P_PID, pid, PC_GETPARMS, (caddr_t)&pcparms) ==
-		    -1L) {
-			cvcd_err(LOG_ERR, "priocntl(GETPARMS): %s",
-			    strerror(errno));
-		} else {
-			cvcd_err(LOG_DEBUG, "PID: %d, new priority: %d.", pid,
-			    tsparmsp->ts_upri);
-		}
-	}
-}
-
-
-/*
- * cvcd_init_host_socket
- *
- * Given a TCP port number, create and initialize a socket appropriate for
- * accepting incoming connections to that port.
- */
-static int
-cvcd_init_host_socket(int port, uint8_t ah_auth_alg, uint8_t esp_encr_alg,
-	uint8_t esp_auth_alg)
-{
-	int			err;
-	int			fd;
-	int			optval;
-	int 			optlen = sizeof (optval);
-	ipsec_req_t		ipsec_req;	/* For per-socket IPsec */
-	struct sockaddr_in6	sin6;		/* IPv6 listen socket   */
-
-	/*
-	 * Start by creating the socket, which needs to support IPv6.
-	 */
-	fd = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP);
-	if (fd == -1) {
-		cvcd_err(LOG_ERR, "socket: %s", strerror(errno));
-		exit(1);
-	}
-
-	/*
-	 * Set the SO_REUSEADDR option, and make the socket non-blocking.
-	 */
-	optval = 1;
-	err = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, optlen);
-	if (err == -1) {
-		cvcd_err(LOG_ERR, "setsockopt: %s", strerror(errno));
-		exit(1);
-	}
-
-	err = ioctl(fd, FIONBIO, &optval);
-	if (err == -1) {
-		cvcd_err(LOG_ERR, "ioctl: %s", strerror(errno));
-		exit(1);
-	}
-
-	/*
-	 * Enable per-socket IPsec if the user specified an AH or ESP
-	 * algorithm to use and global policy is not in effect.
-	 */
-	if (!cvcd_global_policy() &&
-	    (ah_auth_alg != SADB_AALG_NONE || esp_encr_alg != SADB_EALG_NONE ||
-	    esp_auth_alg != SADB_AALG_NONE)) {
-		bzero(&ipsec_req, sizeof (ipsec_req));
-
-		/* Hardcoded values */
-		ipsec_req.ipsr_self_encap_req	= SELF_ENCAP_REQ;
-		/* User defined */
-		ipsec_req.ipsr_auth_alg		= ah_auth_alg;
-		ipsec_req.ipsr_esp_alg		= esp_encr_alg;
-		if (ah_auth_alg != SADB_AALG_NONE)
-			ipsec_req.ipsr_ah_req		= AH_REQ;
-		if (esp_encr_alg != SADB_EALG_NONE ||
-		    esp_auth_alg != SADB_AALG_NONE) {
-			ipsec_req.ipsr_esp_req		= ESP_REQ;
-			ipsec_req.ipsr_esp_auth_alg	= esp_auth_alg;
-		}
-
-		err = setsockopt(fd, IPPROTO_IPV6, IPV6_SEC_OPT,
-		    (void *)&ipsec_req, sizeof (ipsec_req));
-
-		if (err == -1) {
-			cvcd_err(LOG_ERR, "failed to enable per-socket IPsec");
-			cvcd_err(LOG_ERR, "setsockopt: %s", strerror(errno));
-			exit(1);
-		}
-	}
-
-	/*
-	 * Bind the socket to our local address and port.
-	 */
-	bzero(&sin6, sizeof (sin6));
-	sin6.sin6_family = AF_INET6;
-	sin6.sin6_port = htons(port);
-	sin6.sin6_addr = in6addr_any;
-	err = bind(fd, (struct sockaddr *)&sin6, sizeof (sin6));
-	if (err == -1) {
-		cvcd_err(LOG_ERR, "bind: %s", strerror(errno));
-		exit(1);
-	}
-
-	/*
-	 * Indicate that we want to accept connections on this socket.  Since we
-	 * only allow one connection at a time anyway, specify a maximum backlog
-	 * of 1.
-	 */
-	err = listen(fd, 1);
-	if (err == -1) {
-		cvcd_err(LOG_ERR, "listen: %s", strerror(errno));
-		exit(1);
-	}
-
-	return (fd);
-}
-
-
-/*
- * cvcd_do_network_console
- *
- * With established connections to the network and the redirection driver,
- * shuttle data between the two until something goes wrong.
- */
-static void
-cvcd_do_network_console(void)
-{
-	int	i;
-	int	err;
-	int	count;
-	short	revents;
-	int	input_len = 0;
-	int	output_len = 0;
-	int	input_off = 0;
-	int	output_off = 0;
-	char	input_buf[MAXPKTSZ];
-	char	output_buf[MAXPKTSZ];
-
-	for (;;) {
-		/*
-		 * Wait for activity on any of the open file descriptors, which
-		 * includes the ability to write data if we have any to write.
-		 * If poll() fails, break out of the network console processing
-		 * loop.
-		 */
-		pfds[LISTEN_PFD].events = POLLIN;
-		pfds[NETWORK_PFD].events = POLLIN;
-		if (output_len != 0) {
-			pfds[NETWORK_PFD].events |= POLLOUT;
-		}
-		pfds[REDIR_PFD].events = POLLIN;
-		if (input_len != 0) {
-			pfds[REDIR_PFD].events |= POLLOUT;
-		}
-		err = poll(pfds, NUM_PFDS, -1);
-		if (err == -1) {
-			cvcd_err(LOG_ERR, "poll: %s", strerror(errno));
-			break;
-		}
-
-		/*
-		 * If any errors or hangups were detected, or one of our file
-		 * descriptors is bad, bail out of the network console
-		 * processing loop.
-		 */
-		for (i = 0; i < NUM_PFDS; i++) {
-			revents = pfds[i].revents;
-			if (revents & (POLLERR | POLLHUP | POLLNVAL)) {
-				cvcd_err(LOG_NOTICE,
-				    "poll: status on %s fd:%s%s%s",
-				    ((i == LISTEN_PFD) ? "listen" :
-				    ((i == NETWORK_PFD) ? "network" : "redir")),
-				    (revents & POLLERR) ? " error" : "",
-				    (revents & POLLHUP) ? " hangup" : "",
-				    (revents & POLLNVAL) ? " bad fd" : "");
-				goto fail;	/* 'break' wouldn't work here */
-			}
-		}
-
-		/*
-		 * Start by rejecting any connection attempts, since we only
-		 * allow one network connection at a time.
-		 */
-		if (pfds[LISTEN_PFD].revents & POLLIN) {
-			int	fd;
-
-			fd = accept(pfds[LISTEN_PFD].fd, NULL, NULL);
-			if (fd > 0) {
-				(void) close(fd);
-			}
-		}
-
-		/*
-		 * If we have data waiting to be written in one direction or the
-		 * other, go ahead and try to send the data on its way.  We're
-		 * going to attempt the writes regardless of whether the poll
-		 * indicated that the destinations are ready, because we want to
-		 * find out if either descriptor has a problem (e.g. broken
-		 * network link).
-		 * If an "unexpected" error is detected, give up and break out
-		 * of the network console processing loop.
-		 */
-		if (output_len != 0) {
-			count = write(pfds[NETWORK_PFD].fd,
-			    &(output_buf[output_off]), output_len);
-			if ((count == -1) && (errno != EAGAIN)) {
-				cvcd_err(LOG_ERR, "write(network): %s",
-				    strerror(errno));
-				break;
-			} else if (count > 0) {
-				output_len -= count;
-				if (output_len == 0) {
-					output_off = 0;
-				} else {
-					output_off += count;
-				}
-			}
-		}
-
-		if (input_len != 0) {
-			count = write(pfds[REDIR_PFD].fd,
-			    &(input_buf[input_off]), input_len);
-			if ((count == -1) && (errno != EAGAIN)) {
-				cvcd_err(LOG_ERR, "write(redir): %s",
-				    strerror(errno));
-				break;
-			} else if (count > 0) {
-				input_len -= count;
-				if (input_len == 0) {
-					input_off = 0;
-				} else {
-					input_off += count;
-				}
-			}
-		}
-
-		/*
-		 * Finally, take a look at each data source and, if there isn't
-		 * any residual data from that source still waiting to be
-		 * processed, see if more data can be read.  We don't want to
-		 * read more data from a source if we haven't finished
-		 * processing the last data we read from it because doing so
-		 * would maximize the amount of data lost if the network console
-		 * failed or was closed.
-		 * If an "unexpected" error is detected, give up and break out
-		 * of the network console processing loop.
-		 * The call to read() appears to be in the habit of returning 0
-		 * when you've read all of the data from a stream that has been
-		 * hung up, and poll apparently feels that that condition
-		 * justifies setting POLLIN, so we're going to treat 0 as an
-		 * error return from read().
-		 */
-		if ((output_len == 0) && (pfds[REDIR_PFD].revents & POLLIN)) {
-			count = read(pfds[REDIR_PFD].fd, output_buf, MAXPKTSZ);
-			if (count <= 0) {
-				/*
-				 * Reading 0 simply means there is no data
-				 * available, since this is a terminal.
-				 */
-				if ((count < 0) && (errno != EAGAIN)) {
-					cvcd_err(LOG_ERR, "read(redir): %s",
-					    strerror(errno));
-					break;
-				}
-			} else {
-				output_len = count;
-				output_off = 0;
-			}
-		}
-
-		if ((input_len == 0) && (pfds[NETWORK_PFD].revents & POLLIN)) {
-			count = read(pfds[NETWORK_PFD].fd, input_buf, MAXPKTSZ);
-			if (count <= 0) {
-				/*
-				 * Reading 0 here implies a hangup, since this
-				 * is a non-blocking socket that poll() reported
-				 * as having data available.  This will
-				 * typically occur when the console user drops
-				 * to OBP or intentially switches to IOSRAM
-				 * mode.
-				 */
-				if (count == 0) {
-					cvcd_err(LOG_NOTICE,
-					    "read(network): hangup detected");
-					break;
-				} else if (errno != EAGAIN) {
-					cvcd_err(LOG_ERR, "read(network): %s",
-					    strerror(errno));
-					break;
-				}
-			} else {
-				input_len = count;
-				input_off = 0;
-			}
-		}
-	} /* End forever loop */
-
-	/*
-	 * If we get here, something bad happened during an attempt to access
-	 * either the redirection driver or the network connection.  There
-	 * doesn't appear to be any way to avoid the possibility of losing
-	 * console input and/or input in that case, so we should at least report
-	 * the loss if it happens.
-	 * XXX - We could do more, but is it worth the effort?  Logging the
-	 *	 lost data would be pretty easy... actually preserving it
-	 *	 in the console flow would be a lot harder.  We're more robust
-	 *	 than the previous generation at this point, at least, so
-	 *	 perhaps that's enough for now?
-	 */
-fail:
-	if (input_len != 0) {
-		cvcd_err(LOG_ERR, "console input lost");
-	}
-	if (output_len != 0) {
-		cvcd_err(LOG_ERR, "console output lost");
-	}
-}
-
-
-static void
-cvcd_usage()
-{
-#if defined(DEBUG)
-	(void) printf("%s [-d] [-p port] "
-	    "[-a none|md5|sha1] [-e none|des|3des] [-u none|md5|sha1]\n",
-	    progname);
-#else
-	(void) printf("%s [-a none|md5|sha1] [-e none|des|3des] "
-	    "[-u none|md5|sha1]\n", progname);
-#endif  /* DEBUG */
-}
-
-/*
- * cvcd_err ()
- *
- * Description:
- * Log messages via syslog daemon.
- *
- * Input:
- * code - logging code
- * format - messages to log
- *
- * Output:
- * void
- *
- */
-static void
-cvcd_err(int code, char *format, ...)
-{
-	va_list	varg_ptr;
-	char	buf[MAXPKTSZ];
-
-	va_start(varg_ptr, format);
-	(void) vsnprintf(buf, MAXPKTSZ, format, varg_ptr);
-	va_end(varg_ptr);
-
-	if (debug == 0) {
-		syslog(code, buf);
-	} else {
-		(void) fprintf(stderr, "%s: %s\n", progname, buf);
-	}
-}
-
-/*
- * has_cvcd_token
- *
- * Look for "?port [cvc_hostd|442]" in input buf.
- * Assume only a single thread calls here.
- */
-static boolean_t
-has_cvcd_token(char *buf)
-{
-	char 		*token;
-	char		*delims = "{} \t\n";
-	boolean_t 	port = B_FALSE;
-
-	while ((token = strtok(buf, delims)) != NULL) {
-		buf = NULL;
-		if (port == B_TRUE) {
-			if (strcmp(token, "cvc_hostd") == 0 ||
-			    strcmp(token, "442") == 0) {
-				return (B_TRUE);
-			} else {
-				return (B_FALSE);
-			}
-		}
-		if (strlen(token) == 5) {
-			token++;
-			if (strcmp(token, "port") == 0) {
-				port = B_TRUE;
-				continue;
-			}
-		}
-	}
-	return (B_FALSE);
-}
-
-/*
- * cvcd_global_policy
- *
- * Check global policy file for cvcd entry. Just covers common cases.
- */
-static boolean_t
-cvcd_global_policy()
-{
-	FILE		*fp;
-	char		buf[256];
-	boolean_t	rv = B_FALSE;
-
-	fp = fopen("/etc/inet/ipsecinit.conf", "r");
-	if (fp == NULL)
-		return (B_FALSE);
-	while (fgets(buf, sizeof (buf), fp) != NULL) {
-		if (buf[0] == '#')
-			continue;
-		if (has_cvcd_token(buf)) {
-			rv = B_TRUE;
-			cvcd_err(LOG_NOTICE, "cvcd using global policy");
-			break;
-		}
-	}
-	(void) fclose(fp);
-	return (rv);
-}

--- a/usr/src/cmd/cvcd/svc-cvcd	Wed May 29 18:07:38 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-#!/sbin/sh
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-# Copyright 2019 Peter Tribble.
-#
-# Start script for cvcd
-#
-# For modifying parameters passed to cvcd, do not edit
-# this script. Instead use svccfg(1m) to modify the SMF
-# repository. For example:
-#
-# svccfg
-# svc:> select system/cvc
-# svc:system/cvc> setprop cvc/ah_auth = "md5"
-# svc:/system/cvc> exit
-
-
-. /lib/svc/share/smf_include.sh
-
-getproparg() {
-	val=`svcprop -p $2 $SMF_FMRI`
-	[ -n "$val" ] && [ "$val" != 'none' ] &&  echo $1 $val
-}
-
-platform=`/sbin/uname -i`
-starcat="SUNW,Sun-Fire-15000" 
-
-if [ $platform = "$starcat" ]; then
-	args=""
-	args="$args `getproparg -a cvc/ah_auth`"
-	args="$args `getproparg -e cvc/esp_encr`"
-	args="$args `getproparg -u cvc/esp_auth`"
-	/platform/$platform/lib/cvcd $args	# Fail if can't execute
-	exit					# Use cvcd's exit status
-else
-	echo "$SMF_FMRI is not supported on this platform."
-	exit $SMF_EXIT_ERR_CONFIG
-fi
-
-exit 0

--- a/usr/src/cmd/dcs/sparc/sun4u/dcs.xml	Wed May 29 18:07:38 2019 +0200
+++ b/usr/src/cmd/dcs/sparc/sun4u/dcs.xml	Fri May 31 14:32:40 2019 +0200
@@ -4,6 +4,7 @@
 <!--
  Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  Use is subject to license terms.
+ Copyright 2019 Peter Tribble.
 
  CDDL HEADER START
 
@@ -24,8 +25,6 @@
 
  CDDL HEADER END
 
-	ident	"%Z%%M%	%I%	%E% SMI"
-
 	NOTE:  This service manifest is not editable; its contents will
 	be overwritten by package or patch operations, including
 	operating system upgrade.  Make customizations in a different
@@ -49,7 +48,7 @@
 			<service_fmri value='svc:/network/loopback' />
 	</dependency>
 
-	<!-- sckmd is required on OPL and Starcat but Not Starfile -->
+	<!-- sckmd is only required on OPL -->
 	<dependency
 		name='sckmd'
 		grouping='optional_all'
@@ -58,7 +57,7 @@
 			<service_fmri value='svc:/platform/sun4u/sckmd' />
 	</dependency>
 
-	<dependency 
+	<dependency
 		name='cryptosvc'
 		grouping='require_all'
 		restart_on='none'
@@ -66,7 +65,7 @@
 			<service_fmri value='svc:/system/cryptosvc' />
 	</dependency>
 
-	<dependency 
+	<dependency
 		name='filesystem_usr'
 		grouping='require_all'
 		restart_on='none'
@@ -96,13 +95,6 @@
 		timeout_seconds='60'>
 	</exec_method>
 
-	<!-- these are passed to dcs in the method script -->
-	<property_group name='dcs' type='application'>
-		<propval name='ah_auth' type='astring' value='md5' />
-		<propval name='esp_encr' type='astring' value='none' />
-		<propval name='esp_auth' type='astring' value='none' />
-	</property_group>
-
 	<stability value='Unstable' />
 
 	<template>