Date: Sat, 17 Aug 2013 16:42:19 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r254456 - stable/9/sys/kern Message-ID: <201308171642.r7HGgJge017780@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Aug 17 16:42:18 2013 New Revision: 254456 URL: http://svnweb.freebsd.org/changeset/base/254456 Log: Fix the mismerge in r254444, use '==' instead of '='. Pointed out by: jilles, John Wehle <john@feith.com> Modified: stable/9/sys/kern/vfs_lookup.c Modified: stable/9/sys/kern/vfs_lookup.c ============================================================================== --- stable/9/sys/kern/vfs_lookup.c Sat Aug 17 15:21:17 2013 (r254455) +++ stable/9/sys/kern/vfs_lookup.c Sat Aug 17 16:42:18 2013 (r254456) @@ -175,7 +175,7 @@ namei(struct nameidata *ndp) * not an absolute path, and not containing '..' components) to * a real file descriptor, not the pseudo-descriptor AT_FDCWD. */ - if (error = 0 && IN_CAPABILITY_MODE(td)) { + if (error == 0 && IN_CAPABILITY_MODE(td)) { ndp->ni_strictrelative = 1; if (ndp->ni_dirfd == AT_FDCWD) error = ECAPMODE;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308171642.r7HGgJge017780>