[illumos-gate merge]

commit 5690df7e59608f4ee5c051c27524c9d55186cf58
    6498 typo in libavl(3LIB) man page
commit ba9ca9119d43e9c8e21e14f2129dce27d2dc0cdc
    5468 Missing dependencies in lib/Makefile
commit 62ef8476c4f1cb016de161827d921418dee4b031
    4008 libdladm should not have a curses UI inside
commit e8ea23086f5fd6f2b2f60c03b98d019041a374a2
    6485 sun-ssh isn't happy with /etc/ssh/moduli contents after 6440

	Conflicts:
	usr/src/lib/libdladm/Makefile.com
	usr/src/cmd/ssh/etc/Makefile
	usr/src/lib/Makefile
	usr/src/cmd/flowstat/flowstat.c
	usr/src/cmd/dladm/dladm.c

1 files changed, 3 insertions, 21 deletions

diff --git a/usr/src/cmd/dladm/dladm.c b/usr/src/cmd/dladm/dladm.c
index 8e4f61fae0..5c44ecf0ef 100644
--- a/usr/src/cmd/dladm/dladm.c
+++ b/usr/src/cmd/dladm/dladm.c
@@ -3503,7 +3503,6 @@ do_show_link(int argc, char *argv[], const char *use)
 {
 	int		option;
 	boolean_t	s_arg = B_FALSE;
-	boolean_t	S_arg = B_FALSE;
 	boolean_t	i_arg = B_FALSE;
 	uint32_t	flags = DLADM_OPT_ACTIVE;
 	boolean_t	p_arg = B_FALSE;
@@ -3526,7 +3525,7 @@ do_show_link(int argc, char *argv[], const char *use)
 	bzero(&state, sizeof (state));
 
 	opterr = 0;
-	while ((option = getopt_long(argc, argv, ":pPsSi:o:z:",
+	while ((option = getopt_long(argc, argv, ":pPsi:o:z:",
 	    show_lopts, NULL)) != -1) {
 		switch (option) {
 		case 'p':
@@ -3547,12 +3546,6 @@ do_show_link(int argc, char *argv[], const char *use)
 
 			flags = DLADM_OPT_PERSIST;
 			break;
-		case 'S':
-			if (S_arg)
-				die_optdup(option);
-
-			S_arg = B_TRUE;
-			break;
 		case 'o':
 			o_arg = B_TRUE;
 			fields_str = optarg;
@@ -3574,18 +3567,12 @@ do_show_link(int argc, char *argv[], const char *use)
 		}
 	}
 
-	if (i_arg && !(s_arg || S_arg))
-		die("the option -i can be used only with -s or -S");
-
-	if (s_arg && S_arg)
-		die("the -s option cannot be used with -S");
+	if (i_arg && !s_arg)
+		die("the option -i can be used only with -s");
 
 	if (s_arg && flags != DLADM_OPT_ACTIVE)
 		die("the option -P cannot be used with -s");
 
-	if (S_arg && (p_arg || flags != DLADM_OPT_ACTIVE))
-		die("the option -%c cannot be used with -S", p_arg ? 'p' : 'P');
-
 	/* get link name (optional last argument) */
 	if (optind == (argc-1)) {
 		uint32_t	f;
@@ -3610,11 +3597,6 @@ do_show_link(int argc, char *argv[], const char *use)
 	if (p_arg && !o_arg)
 		die("-p requires -o");
 
-	if (S_arg) {
-		dladm_continuous(handle, linkid, NULL, interval, LINK_REPORT);
-		return;
-	}
-
 	if (p_arg && strcasecmp(fields_str, "all") == 0)
 		die("\"-o all\" is invalid with -p");