From owner-svn-src-stable@FreeBSD.ORG  Sat Jul 10 09:29:49 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 532F7106566C;
	Sat, 10 Jul 2010 09:29:49 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 419F08FC08;
	Sat, 10 Jul 2010 09:29:49 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6A9Tnp2013070;
	Sat, 10 Jul 2010 09:29:49 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6A9Tnhn013069;
	Sat, 10 Jul 2010 09:29:49 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201007100929.o6A9Tnhn013069@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sat, 10 Jul 2010 09:29:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209870 - stable/8/cddl/compat/opensolaris/misc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jul 2010 09:29:49 -0000

Author: mm
Date: Sat Jul 10 09:29:48 2010
New Revision: 209870
URL: http://svn.freebsd.org/changeset/base/209870

Log:
  MFC r209757:
  
  - Add support for the "sec" option to "zfs set sharenfs"
  
  Submitted by:	Dmitry Morozovsky <marck@FreeBSD.org>
  Approved by:	delphij (mentor)

Modified:
  stable/8/cddl/compat/opensolaris/misc/fsshare.c
Directory Properties:
  stable/8/cddl/compat/opensolaris/   (props changed)

Modified: stable/8/cddl/compat/opensolaris/misc/fsshare.c
==============================================================================
--- stable/8/cddl/compat/opensolaris/misc/fsshare.c	Sat Jul 10 03:45:55 2010	(r209869)
+++ stable/8/cddl/compat/opensolaris/misc/fsshare.c	Sat Jul 10 09:29:48 2010	(r209870)
@@ -110,11 +110,11 @@ getline(FILE *fd, const char *skip)
  *
  * Recognized keywords:
  *
- *	ro, maproot, mapall, mask, network, alldirs, public, webnfs, index, quiet
+ *	ro, maproot, mapall, mask, network, sec, alldirs, public, webnfs, index, quiet
  *
  */
 static const char *known_opts[] = { "ro", "maproot", "mapall", "mask",
-    "network", "alldirs", "public", "webnfs", "index", "quiet", NULL };
+    "network", "sec", "alldirs", "public", "webnfs", "index", "quiet", NULL };
 static char *
 translate_opts(const char *shareopts)
 {