From 1962723d77534d1a0a079b951e47a3791c886092 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Wed, 6 Jan 2016 19:05:01 +0200 Subject: 6545 fix for 6540 did miss the pam_sm_close_session() Reviewed by: Richard Lowe Reviewed by: Lauri Tirkkonen Approved by: Dan McDonald --- usr/src/lib/pam_modules/unix_session/unix_session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/lib/pam_modules/unix_session/unix_session.c b/usr/src/lib/pam_modules/unix_session/unix_session.c index b121b26a1b..0c10906e47 100644 --- a/usr/src/lib/pam_modules/unix_session/unix_session.c +++ b/usr/src/lib/pam_modules/unix_session/unix_session.c @@ -79,7 +79,7 @@ pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, for (i = 0; i < argc; i++) { if (strcasecmp(argv[i], "debug") == 0) debug = 1; - else + else if (strcasecmp(argv[i], "nowarn") != 0) syslog(LOG_ERR, "illegal option %s", argv[i]); } -- cgit v1.2.3 From cb605c4d8ab24b5a900b8b4ca85db65c22d05fad Mon Sep 17 00:00:00 2001 From: Gerhard Roethlin Date: Tue, 5 Jan 2016 20:47:06 -0800 Subject: 6544 incorrect comment in libzfs.h about offline status Reviewed by: Matthew Ahrens Approved by: Dan McDonald --- usr/src/lib/libzfs/common/libzfs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/lib/libzfs/common/libzfs.h b/usr/src/lib/libzfs/common/libzfs.h index 1ebf520297..cbfcc542b6 100644 --- a/usr/src/lib/libzfs/common/libzfs.h +++ b/usr/src/lib/libzfs/common/libzfs.h @@ -322,7 +322,7 @@ typedef enum { ZPOOL_STATUS_VERSION_OLDER, /* older legacy on-disk version */ ZPOOL_STATUS_FEAT_DISABLED, /* supported features are disabled */ ZPOOL_STATUS_RESILVERING, /* device being resilvered */ - ZPOOL_STATUS_OFFLINE_DEV, /* device online */ + ZPOOL_STATUS_OFFLINE_DEV, /* device offline */ ZPOOL_STATUS_REMOVED_DEV, /* removed device */ /* -- cgit v1.2.3 From c33daa8a12c00116c8a2c9e33f05c08a53937de3 Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Wed, 6 Jan 2016 12:58:45 -0800 Subject: 6543 Memory leak in uu_avl_pool_destroy Reviewed by: Matthew Ahrens Reviewed by: Robert Mustacci Approved by: Dan McDonald --- usr/src/lib/libuutil/common/uu_avl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usr/src/lib/libuutil/common/uu_avl.c b/usr/src/lib/libuutil/common/uu_avl.c index 308e9208fe..8a2d2cf2df 100644 --- a/usr/src/lib/libuutil/common/uu_avl.c +++ b/usr/src/lib/libuutil/common/uu_avl.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include "libuutil_common.h" #include @@ -128,6 +126,7 @@ uu_avl_pool_destroy(uu_avl_pool_t *pp) pp->uap_next->uap_prev = pp->uap_prev; pp->uap_prev->uap_next = pp->uap_next; (void) pthread_mutex_unlock(&uu_apool_list_lock); + (void) pthread_mutex_destroy(&pp->uap_lock); pp->uap_prev = NULL; pp->uap_next = NULL; uu_free(pp); -- cgit v1.2.3