[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, 4 insertions, 21 deletions

diff --git a/usr/src/cmd/flowstat/flowstat.c b/usr/src/cmd/flowstat/flowstat.c
index 781ce6b0f0..faabd74a14 100644
--- a/usr/src/cmd/flowstat/flowstat.c
+++ b/usr/src/cmd/flowstat/flowstat.c
@@ -192,7 +192,7 @@ static dladm_handle_t handle = NULL;
 
 const char *usage_ermsg = "flowstat [-r | -t] [-i interval] "
 	    "[-l link] [-z zonename] [flow]\n"
-	    "       flowstat [-S] [-A] [-i interval] [-p] [ -o field[,...]]\n"
+	    "       flowstat [-A] [-i interval] [-p] [ -o field[,...]]\n"
 	    "                [-u R|K|M|G|T|P] [-l link] [-z zonename] [flow]\n"
 	    "       flowstat -h [-a] [-d] [-F format]"
 	    " [-s <DD/MM/YYYY,HH:MM:SS>]\n"
@@ -547,7 +547,6 @@ main(int argc, char *argv[])
 	boolean_t		o_arg = B_FALSE;
 	boolean_t		u_arg = B_FALSE;
 	boolean_t		A_arg = B_FALSE;
-	boolean_t		S_arg = B_FALSE;
 	boolean_t		flow_arg = B_FALSE;
 	datalink_id_t		linkid = DATALINK_ALL_LINKID;
 	char			linkname[MAXLINKNAMELEN];
@@ -588,7 +587,7 @@ main(int argc, char *argv[])
 	bzero(&state, sizeof (state));
 
 	opterr = 0;
-	while ((option = getopt_long(argc, argv, ":rtApSi:o:u:l:hz:",
+	while ((option = getopt_long(argc, argv, ":rtApi:o:u:l:hz:",
 	    NULL, NULL)) != -1) {
 		switch (option) {
 		case 'r':
@@ -615,11 +614,6 @@ main(int argc, char *argv[])
 
 			p_arg = B_TRUE;
 			break;
-		case 'S':
-			if (S_arg)
-				die_optdup(option);
-			S_arg = B_TRUE;
-			break;
 		case 'i':
 			if (i_arg)
 				die_optdup(option);
@@ -648,9 +642,9 @@ main(int argc, char *argv[])
 			break;
 		case 'h':
 			if (r_arg || t_arg || p_arg || o_arg || u_arg ||
-			    i_arg || S_arg || A_arg) {
+			    i_arg || A_arg) {
 				die("the option -h is not compatible with "
-				    "-r, -t, -p, -o, -u, -i, -S, -A");
+				    "-r, -t, -p, -o, -u, -i, -A");
 			}
 			do_show_history(argc, argv);
 			return (0);
@@ -676,11 +670,6 @@ main(int argc, char *argv[])
 	if (p_arg && strcasecmp(o_fields_str, "all") == 0)
 		die("\"-o all\" is invalid with -p");
 
-	if (S_arg &&
-	    (r_arg || t_arg || p_arg || o_arg || u_arg))
-		die("the option -S is not compatible with "
-		    "-r, -t, -p, -o, -u");
-
 	if (A_arg &&
 	    (r_arg || t_arg || p_arg || o_arg || u_arg || i_arg))
 		die("the option -A is not compatible with "
@@ -702,12 +691,6 @@ main(int argc, char *argv[])
 		usage();
 	}
 
-	if (S_arg) {
-		dladm_continuous(handle, linkid, (flow_arg ? flowname : NULL),
-		    interval, FLOW_REPORT);
-		return (0);
-	}
-
 	if (flow_arg &&
 	    dladm_flow_info(handle, flowname, &attr) != DLADM_STATUS_OK)
 		die("invalid flow %s", flowname);