--- /dev/null	Mon Aug  5 17:19:21 2019
+++ new/usr/src/test/nfsgen-tests/tests/acl/nontrivial/acl_chmod_delete_pos001.ksh	Mon Aug  5 17:19:21 2019
@@ -0,0 +1,351 @@
+#! /usr/bin/ksh -p
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
+. $STF_SUITE/tests/acl/acl_common.kshlib
+
+#################################################################################
+#
+# __stc_assertion_start
+#
+# ID: acl_chmod_delete_pos001
+#
+# DESCRIPTION:
+#	Verify that the combined delete_child/delete permission for 
+#	owner/group/everyone are correct.
+#
+#        -------------------------------------------------------
+#        |   Parent Dir  |           Target Object Permissions |
+#        |  permissions  |                                     |
+#        -------------------------------------------------------
+#        |               | ACL Allows | ACL Denies| Delete     |
+#        |               |  Delete    |  Delete   | unspecified|
+#        -------------------------------------------------------
+#        |  ACL Allows   | Permit     | Permit    | Permit     |
+#        |  DELETE_CHILD |                                     |
+#        -------------------------------------------------------
+#        |  ACL Denies   | Permit     | Deny      | Deny       |
+#        |  DELETE_CHILD |            |           |            |
+#        -------------------------------------------------------
+#        | ACL specifies |            |           |            |
+#        | only allows   | Permit     | Permit    | Permit     |
+#        | write and     |            |           |            |
+#        | execute       |            |           |            |
+#        -------------------------------------------------------
+#        | ACL denies    |            |           |            |
+#        | write and     | Permit     | Deny      | Deny       |
+#        | execute       |            |           |            |
+#        ------------------------------------------------------- 
+#
+# STRATEGY:
+# 1. Create file and  directory in nfs filesystem
+# 2. Set special ACE combination to the file and directory
+# 3. Try to remove the file
+# 4. Verify that combined permissions for owner/group/everyone are correct.
+#
+# TESTABILITY: explicit
+#
+# TEST_AUTOMATION_LEVEL: automated
+#
+# __stc_assertion_end
+#
+################################################################################
+
+[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+	&& set -x
+
+function case_cleanup
+{
+	[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+		&& set -x
+
+	if [[ ! -e $target ]]; then
+		RUN_CHECK $TAR xpf $ARCHIVEFILE
+	fi
+
+	(( ${#cwd} != 0 )) && cd $cwd
+	cleanup_test_files basedir
+	if [[ -e $ARCHIVEFILE ]]; then
+		RUN_CHECK $RM -f $ARCHIVEFILE
+	fi
+
+	[[ -n $1 ]] && cleanup $1 || return 0
+}
+
+#owner@	          group	                 group_users       other_users
+set -A users \
+"root"  "root"  "$ACL_ADMIN"  "$ACL_OTHER1" \
+"$ACL_STAFF1" "$ACL_STAFF_GROUP" "$ACL_STAFF2" "$ACL_OTHER1"
+
+set -A access_parent \
+	"delete_child:allow" \
+	"delete_child:deny" \
+	"write_data:allow" \
+	"write_data:deny" \
+	"delete_child:deny write_data:allow" \
+	"delete_child:allow write_data:deny"
+
+set -A access_target \
+	"delete:allow" \
+	"delete:deny" \
+	""
+
+set -A a_flag "owner@" "group@" "everyone@" "user:$ACL_STAFF1"
+
+
+echo "ASSERTION: Verify that the combined delete_child/delete permission for" \
+	"owner/group/everyone are correct."
+
+function operate_node #user node
+{
+	[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+		&& set -x
+
+	typeset user=$1
+	typeset node=$2
+	typeset ret
+
+	if [[ $user == "" || $node == "" ]]; then
+		echo "user, node are not defined."
+		case_cleanup $STF_FAIL
+	fi
+	if [[ -d $node ]]; then
+		RUN_CHECK chgusr_exec $user $RM -rf $node ; ret=$?
+#		chgusr_exec $user $RM -rf $node
+#		ret=$?
+	else
+		RUN_CHECK chgusr_exec $user $RM -f $node ; ret=$?
+#		chgusr_exec $user $RM -f $node
+#		ret=$?
+	fi
+
+	if [[ -e $node ]]; then
+		if [[ $ret -eq 0 ]]; then
+			echo "$node not removed, but return code is 0."
+			return 1
+		fi
+	else
+		RUN_CHECK $TAR xpf $ARCHIVEFILE \
+			|| case_cleanup $STF_FAIL
+		if [[ $ret -ne 0 ]]; then
+			echo "$node removed, but return code is $ret."
+			return 1
+		fi
+	fi
+	return $ret
+}
+
+function logname #acl_parent acl_target user
+{
+	[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+		&& set -x
+
+	typeset acl_parent=$1
+	typeset acl_target=$2
+	typeset user=$3
+
+	# To super user, read and write deny permission was override.
+	if [[ $user == root || $acl_target == *:allow ]]; then
+		print "RUN_CHECK"
+	elif [[ $acl_parent == *"delete_child"* ]]; then
+		if [[ $acl_parent == *"delete_child:allow"* ]]; then
+			print "RUN_CHECK"
+		else
+			print "RUN_CHECKNEG"
+		fi
+	elif [[ $acl_parent == *"write_data"* ]]; then
+		if [[ $acl_parent == *"write_data:allow"* ]]; then
+			print "RUN_CHECK"
+		else
+			print "RUN_CHECKNEG"
+		fi
+	else
+		print "RUN_CHECKNEG"
+	fi
+}
+
+function check_chmod_results #node flag acl_parent acl_target g_usr o_usr
+{
+	[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+		&& set -x
+
+	typeset node=$1
+	typeset flag=$2
+	typeset acl_parent=$3
+	typeset acl_target=$2:$4
+	typeset g_usr=$5
+	typeset o_usr=$6
+	typeset log acl_tmp
+
+	for acl in $acl_parent ; do
+		acl_tmp="$2:$acl $acl_tmp"
+	done
+	acl_parent=$acl_tmp
+
+	if [[ $flag == "owner@" || $flag == "everyone@" ]]; then
+		eval "log=$(logname "$acl_parent" $acl_target $ACL_CUR_USER)"
+		$log operate_node $ACL_CUR_USER $node || case_cleanup $STF_FAIL
+	fi
+	if [[ $flag == "group@" || $flag == "everyone@" ]]; then
+		eval "log=$(logname "$acl_parent" $acl_target $g_usr)"
+		$log operate_node $g_usr $node || case_cleanup $STF_FAIL
+	fi
+	if [[ $flag == "everyone@" ]]; then
+		eval "log=$(logname "$acl_parent" $acl_target $o_usr)"
+		$log operate_node $o_usr $node || case_cleanup $STF_FAIL
+	fi
+	if [[ $flag == "user:"* ]]; then
+		typeset user=${flag#user:}
+		eval "log=$(logname "$acl_parent" $acl_target $user)"
+		$log operate_node $user $node
+	fi
+}
+
+function test_chmod_basic_access #node g_usr o_usr
+{
+	[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+		&& set -x
+
+	typeset node=${1%/}
+	typeset g_usr=$2
+	typeset o_usr=$3
+	typeset flag acl_p acl_t parent
+	typeset -i i=0
+
+	parent=${node%/*}
+
+	for w_flag in ${a_flag[@]}; do
+	for acl_p in "${access_parent[@]}"; do
+		i=0
+		for acl in $acl_p ; do
+			RUN_CHECK usr_exec $CHMOD A+$w_flag:$acl $parent \
+				|| case_cleanup $STF_FAIL
+			(( i = i + 1))
+		done
+
+		for acl_t in "${access_target[@]}"; do
+			if [[ -n $acl_t ]]; then
+				RUN_CHECK usr_exec $CHMOD \
+					A+${w_flag}:${acl_t} $node \
+					|| case_cleanup $STF_FAIL
+			fi
+
+			RUN_CHECK $TAR cpf $ARCHIVEFILE basedir \
+				|| case_cleanup $STF_FAIL
+
+			check_chmod_results "$node" "$w_flag" \
+				 "$acl_p" "$acl_t" "$g_usr" "$o_usr"
+
+			if [[ -n $acl_t ]]; then
+				RUN_CHECK usr_exec $CHMOD A0- $node \
+					|| case_cleanup $STF_FAIL
+			fi
+		done
+
+		while (( i > 0 )); do
+			RUN_CHECK usr_exec $CHMOD A0- $parent \
+				|| case_cleanup $STF_FAIL
+			(( i = i - 1 ))
+		done
+	done	
+	done
+}
+
+function setup_test_files #base_node user group
+{
+	[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+		&& set -x
+
+	typeset base_node=$1
+	typeset user=$2
+	typeset group=$3
+
+	cleanup_test_files $base_node
+
+	RUN_CHECK $MKDIR -p $base_node || case_cleanup $STF_FAIL
+	RUN_CHECK $CHOWN $user:$group $base_node || case_cleanup $STF_FAIL
+
+	RUN_CHECK set_cur_usr $user || case_cleanup $STF_FAIL
+
+	# Prepare all files/sub-dirs for testing.
+	file0=$base_node/testfile_rm
+	dir0=$base_node/testdir_rm
+
+	RUN_CHECK usr_exec $TOUCH $file0 || case_cleanup $STF_FAIL
+	RUN_CHECK usr_exec $CHMOD 444 $file0 || case_cleanup $STF_FAIL
+
+	RUN_CHECK usr_exec $MKDIR -p $dir0 || case_cleanup $STF_FAIL
+	RUN_CHECK usr_exec $CHMOD 444 $dir0 || case_cleanup $STF_FAIL
+
+	RUN_CHECK usr_exec $CHMOD 555 $base_node || case_cleanup $STF_FAIL
+	return 0	
+}
+
+function cleanup_test_files #base_node
+{
+	[[ :$NFSGEN_DEBUG: = *:${NAME}:* || :${NFSGEN_DEBUG}: = *:all:* ]] \
+		&& set -x
+
+	typeset base_node=$1
+
+	if [[ -d $base_node ]]; then
+		RUN_CHECK $RM -rf $base_node || cleanup $STF_FAIL
+	elif [[ -e $base_node ]]; then
+		RUN_CHECK $RM -f $base_node || cleanup $STF_FAIL
+	fi
+
+	return 0
+}
+
+typeset cwd=$PWD
+typeset ARCHIVEFILE=archive.tar
+ 
+typeset -i i=0
+typeset -i j=0
+typeset target
+cd $TESTDIR
+while (( i < ${#users[@]} )); do
+	setup_test_files basedir ${users[i]} ${users[((i+1))]}
+
+	j=0
+	while (( j < 1 )); do
+		eval target=\$file$j	
+		test_chmod_basic_access $target \
+			"${users[((i+2))]}" "${users[((i+3))]}"
+
+		eval target=\$dir$j	
+		test_chmod_basic_access $target \
+			"${users[((i+2))]}" "${users[((i+3))]}"
+
+		(( j = j + 1 ))
+	done
+	
+	(( i += 4 ))
+done
+
+# Verify that the combined delete_child/delete permission for
+# owner/group/everyone are correct.
+case_cleanup $STF_PASS
