[illumos-gate merge]20140123release-20140123

commit a11c1571b6942161b0186d0588609448066892c2
    3141 strptime() doesn't support %t
commit 307b60a6235150b7f87b2f1a16a2724f08c5cab3
    4509 libsysevent(3lib) man page references wrong header file
commit da5ab83fc888325fc812733d8a54bc5eab65c65c
    4500 mptsas_hash_traverse() is unsafe, leads to missing devices

Conflicts:
	usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c (lint)

3 files changed, 11 insertions, 25 deletions

diff --git a/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c b/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c
index f2841e0260..7780c15ae9 100644
--- a/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c
+++ b/usr/src/cmd/mdb/common/modules/mpt_sas/mpt_sas.c
@@ -235,6 +235,7 @@ klist_head(list_t *lp, uintptr_t klp)
 static uintptr_t
 klist_next(list_t *lp, uintptr_t klp, void *op)
 {
+	/* LINTED E_BAD_PTR_CAST_ALIG */
 	struct list_node *np = (struct list_node *)(((char *)op) +
 	    lp->list_offset);
 
@@ -276,6 +277,7 @@ krefhash_next(uintptr_t khp, void *op)
 	void *rp;
 
 	mdb_vread(&mh, sizeof (mh), khp);
+	/* LINTED E_BAD_PTR_CAST_ALIG */
 	lp = (refhash_link_t *)(((char *)(op)) + mh.rh_link_off);
 	ml = *lp;
 	while ((klp = klist_next(&mh.rh_objs,
diff --git a/usr/src/lib/libc/port/locale/strptime.c b/usr/src/lib/libc/port/locale/strptime.c
index fe0fc9654b..90150e37e9 100644
--- a/usr/src/lib/libc/port/locale/strptime.c
+++ b/usr/src/lib/libc/port/locale/strptime.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2014 Gary Mills
  * Copyright 2011, Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
  *
@@ -215,9 +216,6 @@ label:
 				tm->tm_sec = i;
 			}
 
-			if (isspace(*buf))
-				while (*ptr != 0 && !isspace(*ptr))
-					ptr++;
 			break;
 
 		case 'H':
@@ -249,9 +247,6 @@ label:
 
 			tm->tm_hour = i;
 
-			if (isspace(*buf))
-				while (*ptr != 0 && !isspace(*ptr))
-					ptr++;
 			break;
 
 		case 'p':
@@ -319,9 +314,6 @@ label:
 			if (i > 53)
 				return (NULL);
 
-			if (isspace(*buf))
-				while (*ptr != 0 && !isspace(*ptr))
-					ptr++;
 			break;
 
 		case 'w':
@@ -334,11 +326,9 @@ label:
 
 			tm->tm_wday = i;
 
-			if (isspace(*buf))
-				while (*ptr != 0 && !isspace(*ptr))
-					ptr++;
 			break;
 
+		case 'd':
 		case 'e':
 			/*
 			 * The %e format has a space before single digits
@@ -346,8 +336,6 @@ label:
 			 */
 			if (isspace(*buf))
 				buf++;
-			/* FALLTHROUGH */
-		case 'd':
 			/*
 			 * The %e specifier is explicitly documented as not
 			 * being zero-padded but there is no harm in allowing
@@ -370,9 +358,6 @@ label:
 
 			tm->tm_mday = i;
 
-			if (isspace(*buf))
-				while (*ptr != 0 && !isspace(*ptr))
-					ptr++;
 			break;
 
 		case 'B':
@@ -417,9 +402,6 @@ label:
 
 			tm->tm_mon = i - 1;
 
-			if (isspace(*buf))
-				while (*ptr != NULL && !isspace(*ptr))
-					ptr++;
 			break;
 
 		case 's':
@@ -465,9 +447,6 @@ label:
 
 			tm->tm_year = i;
 
-			if (isspace(*buf))
-				while (*ptr != 0 && !isspace(*ptr))
-					ptr++;
 			break;
 
 		case 'Z':
@@ -521,6 +500,11 @@ label:
 			*flagsp |= F_GMT;
 			}
 			break;
+		case 'n':
+		case 't':
+			while (isspace(*buf))
+				buf++;
+			break;
 		}
 	}
 
diff --git a/usr/src/man/man3lib/libsysevent.3lib b/usr/src/man/man3lib/libsysevent.3lib
index 32f97491ff..579e01b25b 100644
--- a/usr/src/man/man3lib/libsysevent.3lib
+++ b/usr/src/man/man3lib/libsysevent.3lib
@@ -3,14 +3,14 @@
 .\" 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]
-.TH LIBSYSEVENT 3LIB "Aug 23, 2007"
+.TH LIBSYSEVENT 3LIB "Jan 21, 2014"
 .SH NAME
 libsysevent \- system event interface library
 .SH SYNOPSIS
 .LP
 .nf
 cc [ \fIflag\fR... ] \fIfile\fR... \fB-lsysevent\fR [ \fIlibrary\fR... ]
-#include <\fBsysevent.h\fR>
+#include <\fBlibsysevent.h\fR>
 .fi
 
 .SH DESCRIPTION