Date: Wed, 6 Mar 2013 21:30:42 +0000 (UTC) From: Jilles Tjoelker <jilles@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r247901 - stable/8/tools/regression/bin/sh/builtins Message-ID: <201303062130.r26LUgHn073888@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jilles Date: Wed Mar 6 21:30:42 2013 New Revision: 247901 URL: http://svnweb.freebsd.org/changeset/base/247901 Log: MFC r213713 by obrien: Correct regression test to not show a false positive when run as root. Modified: stable/8/tools/regression/bin/sh/builtins/cd1.0 Directory Properties: stable/8/tools/regression/bin/sh/ (props changed) Modified: stable/8/tools/regression/bin/sh/builtins/cd1.0 ============================================================================== --- stable/8/tools/regression/bin/sh/builtins/cd1.0 Wed Mar 6 20:02:19 2013 (r247900) +++ stable/8/tools/regression/bin/sh/builtins/cd1.0 Wed Mar 6 21:30:42 2013 (r247901) @@ -6,12 +6,15 @@ cd $P T=$(mktemp -d sh-test.XXXXXX) chmod 0 $T -cd -L $T 2>/dev/null && exit 1 -[ "$PWD" = "$P" ] -[ "$(pwd)" = "$P" ] -cd -P $T 2>/dev/null && exit 1 -[ "$PWD" = "$P" ] -[ "$(pwd)" = "$P" ] +if [ `id -u` -ne 0 ]; then + # Root can always cd, irregardless of directory permissions. + cd -L $T 2>/dev/null && exit 1 + [ "$PWD" = "$P" ] + [ "$(pwd)" = "$P" ] + cd -P $T 2>/dev/null && exit 1 + [ "$PWD" = "$P" ] + [ "$(pwd)" = "$P" ] +fi chmod 755 $T cd $T
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303062130.r26LUgHn073888>