summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.cfg13
-rwxr-xr-xtests/install/install-C-root.sh1
-rwxr-xr-xtests/install/install-C-selinux.sh2
-rwxr-xr-xtests/install/install-C.sh25
4 files changed, 40 insertions, 1 deletions
diff --git a/init.cfg b/init.cfg
index 093cd8586..7976b6166 100644
--- a/init.cfg
+++ b/init.cfg
@@ -502,6 +502,19 @@ skip_if_setgid_()
esac
}
+# Skip if files are created with a different group to the current user
+# This can happen due to a setgid dir, or by some other mechanism on OS X:
+# http://unix.stackexchange.com/q/63865
+# http://bugs.gnu.org/14024#41
+skip_if_nondefault_group_()
+{
+ touch grp.$$
+ gen_ug=$(stat -c '%u:%g' grp.$$)
+ rm grp.$$
+ test "$gen_ug" = "$(id -ru):$(id -rg)" ||
+ skip_ 'Files are created with a different gid'
+}
+
skip_if_mcstransd_is_running_()
{
test $# = 0 || framework_failure_
diff --git a/tests/install/install-C-root.sh b/tests/install/install-C-root.sh
index d8a8d846c..6e6d7eb9d 100755
--- a/tests/install/install-C-root.sh
+++ b/tests/install/install-C-root.sh
@@ -20,6 +20,7 @@
print_ver_ ginstall
require_root_
skip_if_setgid_
+skip_if_nondefault_group_
u1=1
u2=2
diff --git a/tests/install/install-C-selinux.sh b/tests/install/install-C-selinux.sh
index 8513d50b8..ce9e0c360 100755
--- a/tests/install/install-C-selinux.sh
+++ b/tests/install/install-C-selinux.sh
@@ -19,7 +19,7 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ ginstall
require_selinux_
-
+skip_if_nondefault_group_
echo test > a || framework_failure_
chcon -u system_u a || skip_ "chcon doesn't work"
diff --git a/tests/install/install-C.sh b/tests/install/install-C.sh
index 7d3582c40..6051d57f8 100755
--- a/tests/install/install-C.sh
+++ b/tests/install/install-C.sh
@@ -19,6 +19,31 @@
. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
print_ver_ ginstall
skip_if_setgid_
+skip_if_nondefault_group_
+
+# Note if a group is not specified, install(1) will assume that a file
+# would be installed with the current user's group ID, and thus if the
+# file is the same except that it does have a different group due to
+# its parent directory being g+s for example, then the copy will be
+# done again redundantly in a futile attempt to reset the group ID to
+# that of the current user.
+#
+# install -d -g wheel -m 2775 test # Create setgid dir
+# touch test/a # Create source
+# install -Cv -m664 test/a test/i1 # install source with mode
+# install -Cv -m664 test/i1 test/i2 # install dest
+# install -Cv -m664 test/i1 test/i2 # again to see redundant install
+#
+# Similarly if an existing file exists that is the same and has the
+# current users group ID, but when an actual install of the file would
+# reset to a different group ID due to the directory being g+s for example,
+# then the install will not be done when it should.
+#
+# install -Cv -m664 -g "$(id -nrg)" test/i1 test/i2 # set i2 to uesr's gid
+# install -Cv -m664 test/i1 test/i2 # this should install but doesn't
+#
+# Therefore we skip the test in the presence of setgid dirs
+# An additional complication on HFS is that it...
mode1=0644
mode2=0755