diff options
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/fm/topo/modules/common/disk/disk_common.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/topo/modules/common/ses/ses.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/json_nvlist/json_nvlist.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/json_nvlist/json_nvlist.h | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/memset_s.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/gen/set_constraint_handler_s.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/port/mapfile-vers | 5 | ||||
| -rw-r--r-- | usr/src/lib/libmlrpc/common/ndr_process.c | 5 |
8 files changed, 19 insertions, 7 deletions
diff --git a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c index 5a7a5b5467..9110e3bc62 100644 --- a/usr/src/lib/fm/topo/modules/common/disk/disk_common.c +++ b/usr/src/lib/fm/topo/modules/common/disk/disk_common.c @@ -550,7 +550,7 @@ disk_tnode_create(topo_mod_t *mod, tnode_t *parent, return (-1); } - if (dnode->ddn_devid != NULL && + if (dnode != NULL && dnode->ddn_devid != NULL && disk_add_temp_sensor(mod, dtn, dnode->ddn_devid) != 0) { topo_mod_dprintf(mod, "disk_tnode_create: failed to create " "temperature sensor node on bay=%d/disk=0", diff --git a/usr/src/lib/fm/topo/modules/common/ses/ses.c b/usr/src/lib/fm/topo/modules/common/ses/ses.c index 2f85476cb8..7fd6d03cd1 100644 --- a/usr/src/lib/fm/topo/modules/common/ses/ses.c +++ b/usr/src/lib/fm/topo/modules/common/ses/ses.c @@ -1207,6 +1207,9 @@ ses_create_disk(ses_enum_data_t *sdp, tnode_t *pnode, nvlist_t *props) /* * Skip devices that are not in a present (and possibly damaged) state. + * Also, skip devices that this expander is either not fully wired to, + * or are hidden due to SAS zoning, as indicated by the + * SES_ESC_NO_ACCESS state. */ if (nvlist_lookup_uint64(props, SES_PROP_STATUS_CODE, &status) != 0) return (0); @@ -1216,7 +1219,6 @@ ses_create_disk(ses_enum_data_t *sdp, tnode_t *pnode, nvlist_t *props) status != SES_ESC_CRITICAL && status != SES_ESC_NONCRITICAL && status != SES_ESC_UNRECOVERABLE && - status != SES_ESC_NO_ACCESS && status != SES_ESC_UNKNOWN) return (0); diff --git a/usr/src/lib/json_nvlist/json_nvlist.c b/usr/src/lib/json_nvlist/json_nvlist.c index f365c981f3..efe4feed77 100644 --- a/usr/src/lib/json_nvlist/json_nvlist.c +++ b/usr/src/lib/json_nvlist/json_nvlist.c @@ -10,7 +10,7 @@ */ /* - * Copyright 2015 Joyent, Inc. + * Copyright 2018 Joyent, Inc. */ #include <stdio.h> @@ -331,7 +331,7 @@ hdlr_bareword(state_t *s) /* ARGSUSED */ static int collect_number(state_t *s, boolean_t *isint, int32_t *result, - double *fresult __unused) + double *fresult) { boolean_t neg = B_FALSE; int t; diff --git a/usr/src/lib/json_nvlist/json_nvlist.h b/usr/src/lib/json_nvlist/json_nvlist.h index ca01ef44f9..75a70f445b 100644 --- a/usr/src/lib/json_nvlist/json_nvlist.h +++ b/usr/src/lib/json_nvlist/json_nvlist.h @@ -17,7 +17,7 @@ #define _JSON_NVLIST_H #include <libnvpair.h> -#include <libcmdutils.h> +#include <libcustr.h> #ifdef __cplusplus extern "C" { diff --git a/usr/src/lib/libc/port/gen/memset_s.c b/usr/src/lib/libc/port/gen/memset_s.c index 9f3fcf8ec0..c77b02de20 100644 --- a/usr/src/lib/libc/port/gen/memset_s.c +++ b/usr/src/lib/libc/port/gen/memset_s.c @@ -27,6 +27,8 @@ * Copyright 2018 Nexenta Systems, Inc. */ +#define __STDC_WANT_LIB_EXT1__ 1 + #include "lint.h" #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/set_constraint_handler_s.c b/usr/src/lib/libc/port/gen/set_constraint_handler_s.c index 3466b8a1d0..2261a8df0a 100644 --- a/usr/src/lib/libc/port/gen/set_constraint_handler_s.c +++ b/usr/src/lib/libc/port/gen/set_constraint_handler_s.c @@ -27,6 +27,8 @@ * Copyright 2018 Nexenta Systems, Inc. */ +#define __STDC_WANT_LIB_EXT1__ 1 + #include "lint.h" #include <sys/types.h> diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers index 8c9d143a60..16b9f3d7fc 100644 --- a/usr/src/lib/libc/port/mapfile-vers +++ b/usr/src/lib/libc/port/mapfile-vers @@ -608,6 +608,11 @@ $if lf64 posix_fadvise64; posix_fallocate64; $endif +} SUNW_1.22.7; + +SYMBOL_VERSION SUNW_1.22.7 { # s10u10 - SunOS 5.10 (Solaris 10) patch additions + protected: + SUNW_1.22.7; } SUNW_1.22.6; SYMBOL_VERSION SUNW_1.22.6 { # s10u9 - SunOS 5.10 (Solaris 10) patch additions diff --git a/usr/src/lib/libmlrpc/common/ndr_process.c b/usr/src/lib/libmlrpc/common/ndr_process.c index 3188500a8b..19619a2448 100644 --- a/usr/src/lib/libmlrpc/common/ndr_process.c +++ b/usr/src/lib/libmlrpc/common/ndr_process.c @@ -22,7 +22,7 @@ * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * Copyright 2012 Milan Jurik. All rights reserved. - * Copyright 2013 Nexenta Systems, Inc. All rights reserved. + * Copyright 2018 Nexenta Systems, Inc. All rights reserved. */ /* @@ -1984,7 +1984,8 @@ ndr_s_wchar(ndr_ref_t *encl_ref) */ if (nds->m_op == NDR_M_OP_UNMARSHALL) { wcs[wlen] = 0; - slen = ndr__wcstombs(valp, wcs, wlen); + slen = encl_ref->size_is * NDR_MB_CHAR_MAX; + slen = ndr__wcstombs(valp, wcs, slen); if (slen == (size_t)-1) return (0); valp[slen] = '\0'; |