summaryrefslogtreecommitdiff
path: root/mk/install/files
diff options
context:
space:
mode:
authorseb <seb>2005-04-20 17:13:28 +0000
committerseb <seb>2005-04-20 17:13:28 +0000
commit74bbe386c4ba7f9bbaa5827b447ca850eeecf11e (patch)
tree5265a2a8ad3ac1af38d8bd1518478c9d7e2f37ae /mk/install/files
parentf5783c24eb77b3cca85aaadbcde4318414342b18 (diff)
downloadpkgsrc-74bbe386c4ba7f9bbaa5827b447ca850eeecf11e.tar.gz
Execute chmod(1) after chown(1)/chgrp(1) so NetBSD's chown(2) does
not reset any set-user-id or set-group-id bits we may want to set. Approved by jlam@.
Diffstat (limited to 'mk/install/files')
-rw-r--r--mk/install/files10
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/install/files b/mk/install/files
index 2e67c2d6d8f..0e94bd9a56a 100644
--- a/mk/install/files
+++ b/mk/install/files
@@ -1,6 +1,6 @@
#!@SH@
#
-# $NetBSD: files,v 1.4 2005/04/10 11:01:29 jmmv Exp $
+# $NetBSD: files,v 1.5 2005/04/20 17:13:28 seb Exp $
#
# +FILES - reference-counted configuration file management script
#
@@ -118,10 +118,6 @@ ADD)
${ECHO} " $file"
${ECHO} " [$f_eg]"
${CP} $f_eg $file
- case $f_mode in
- "") ;;
- *) ${CHMOD} $f_mode $file ;;
- esac
case $f_user in
"") ;;
*) ${CHOWN} $f_user $file ;;
@@ -130,6 +126,10 @@ ADD)
"") ;;
*) ${CHGRP} $f_group $file ;;
esac
+ case $f_mode in
+ "") ;;
+ *) ${CHMOD} $f_mode $file ;;
+ esac
fi
fi
done