From owner-svn-src-head@FreeBSD.ORG  Mon Jun 22 10:08:48 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CA71E106566C;
	Mon, 22 Jun 2009 10:08:48 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B8A5E8FC08;
	Mon, 22 Jun 2009 10:08:48 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5MA8mWe033919;
	Mon, 22 Jun 2009 10:08:48 GMT (envelope-from kib@svn.freebsd.org)
Received: (from kib@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5MA8mMD033917;
	Mon, 22 Jun 2009 10:08:48 GMT (envelope-from kib@svn.freebsd.org)
Message-Id: <200906221008.n5MA8mMD033917@svn.freebsd.org>
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Mon, 22 Jun 2009 10:08:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194617 - head/sys/cddl/compat/opensolaris/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Jun 2009 10:08:49 -0000

Author: kib
Date: Mon Jun 22 10:08:48 2009
New Revision: 194617
URL: http://svn.freebsd.org/changeset/base/194617

Log:
  O_NOFOLLOW shall be in flags, not in cmode.
  
  Noted by:	bde

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c	Mon Jun 22 09:24:46 2009	(r194616)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c	Mon Jun 22 10:08:48 2009	(r194617)
@@ -83,10 +83,9 @@ kobj_open_file_vnode(const char *file)
 	}
 	FILEDESC_XUNLOCK(fd);
 
-	flags = FREAD;
+	flags = FREAD | O_NOFOLLOW;
 	NDINIT(&nd, LOOKUP, MPSAFE, UIO_SYSSPACE, file, td);
-	error = vn_open_cred(&nd, &flags, O_NOFOLLOW, 0, curthread->td_ucred,
-	    NULL);
+	error = vn_open_cred(&nd, &flags, 0, 0, curthread->td_ucred, NULL);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
 	if (error != 0)
 		return (NULL);