svn commit: r323524 - head/cddl/contrib/opensolaris/lib/libzfs/common

[Andriy Gapon]

Author: avg
Date: Wed Sep 13 10:22:09 2017
New Revision: 323524
URL: https://svnweb.freebsd.org/changeset/base/323524

Log:
  MFV r316932: 6280 libzfs: unshare_one() could fail with EZFS_SHARENFSFAILED
  
  illumos/illumos-gate at d1672efb6feac57c42788e27f739dfa3c4f3baf7
  https://github.com/illumos/illumos-gate/commit/d1672efb6feac57c42788e27f739dfa3c4f3baf7
  
  https://www.illumos.org/issues/6280
    The unshare_one() in libzfs could fail with EZFS_SHARENFSFAILED at line 834
    here:
    831    /* make sure libshare initialized */
    832    if ((err = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) {
    833        free(mntpt);    /* don't need the copy anymore */
    834        return (zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
    835            dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"),
    836            name, _sa_errorstr(err)));
    837    }
    The correct error should be EZFS_UNSHARENFSFAILED instead.
  
  Reviewed by: Toomas Soome <tsoome at me.com>
  Reviewed by: Dan McDonald <danmcd at omniti.com>
  Reviewed by: Matthew Ahrens <mahrens at delphix.com>
  Approved by: Gordon Ross <gwr at nexenta.com>
  Author: Marcel Telka <marcel.telka at nexenta.com>
  
  MFC after:	4 weeks

Modified:
  head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
Directory Properties:
  head/cddl/contrib/opensolaris/   (props changed)
  head/cddl/contrib/opensolaris/lib/libzfs/   (props changed)

Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Wed Sep 13 10:17:14 2017	(r323523)
+++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c	Wed Sep 13 10:22:09 2017	(r323524)
@@ -20,6 +20,7 @@
  */
 
 /*
+ * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014 by Delphix. All rights reserved.
  * Copyright 2016 Igor Kozhukhov <ikozhukhov at gmail.com>
@@ -872,7 +873,7 @@ unshare_one(libzfs_handle_t *hdl, const char *name, co
 	/* make sure libshare initialized */
 	if ((err = zfs_init_libshare(hdl, SA_INIT_SHARE_API)) != SA_OK) {
 		free(mntpt);	/* don't need the copy anymore */
-		return (zfs_error_fmt(hdl, EZFS_SHARENFSFAILED,
+		return (zfs_error_fmt(hdl, EZFS_UNSHARENFSFAILED,
 		    dgettext(TEXT_DOMAIN, "cannot unshare '%s': %s"),
 		    name, _sa_errorstr(err)));
 	}