summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2003-04-08 20:42:44 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2003-04-08 20:42:44 +0000
commitd22153cf1346d4982fcc6f824f8cabaaa4b7a836 (patch)
treed4c1bf935a8552600fe4d0d2fb8047b30eeaecbe
parent70e70feb13fd4f1a1de1a96d316a59390c3ba491 (diff)
Use POSIX chown semantics (user:group); noted by Leandro Costa
-rw-r--r--etc/security16
-rw-r--r--etc/weekly4
-rw-r--r--games/phantasia/Makefile4
-rw-r--r--regress/etc/MAKEDEV/Makefile4
4 files changed, 14 insertions, 14 deletions
diff --git a/etc/security b/etc/security
index 00b74ed33fa..5f24b304a27 100644
--- a/etc/security
+++ b/etc/security
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: security,v 1.55 2002/12/30 13:59:54 millert Exp $
+# $OpenBSD: security,v 1.56 2003/04/08 20:42:42 millert Exp $
# from: @(#)security 8.1 (Berkeley) 6/9/93
#
@@ -90,11 +90,11 @@ if [ -s $CUR ] ; then
else
cp -p $CUR $BACK
cp -p $MP $CUR
- chown root.wheel $CUR
+ chown root:wheel $CUR
fi
else
cp -p $MP $CUR
- chown root.wheel $CUR
+ chown root:wheel $CUR
fi
# Check the group file syntax.
@@ -595,7 +595,7 @@ fi
# Create the mtree tree specifications using:
#
# mtree -cx -pDIR -kcksum,gid,mode,nlink,size,link,time,uid > DIR.secure
-# chown root.wheel DIR.secure
+# chown root:wheel DIR.secure
# chmod 600 DIR.secure
#
# Note, this is not complete protection against Trojan horsed binaries, as
@@ -648,11 +648,11 @@ if [ -s /etc/changelist ] ; then
cat $OUTPUT
cp -p $CUR $BACK
cp -p $file $CUR
- chown root.wheel $CUR $BACK
+ chown root:wheel $CUR $BACK
fi
else
cp -p $file $CUR
- chown root.wheel $CUR
+ chown root:wheel $CUR
fi
fi
done
@@ -670,12 +670,12 @@ if [ -s /etc/changelist ] ; then
echo "NEW: $MD5_NEW"
cp -p $CUR $BACK
echo $MD5_NEW > $CUR
- chown root.wheel $CUR $BACK
+ chown root:wheel $CUR $BACK
chmod 600 $CUR
fi
else
echo $MD5_NEW > $CUR
- chown root.wheel $CUR
+ chown root:wheel $CUR
chmod 600 $CUR
fi
fi
diff --git a/etc/weekly b/etc/weekly
index 5ac97d3fa2f..e9cb9c318b4 100644
--- a/etc/weekly
+++ b/etc/weekly
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: weekly,v 1.12 2003/01/14 08:12:41 jakob Exp $
+# $OpenBSD: weekly,v 1.13 2003/04/08 20:42:42 millert Exp $
#
PATH=/bin:/sbin:/usr/sbin:/usr/bin:/usr/libexec
@@ -23,7 +23,7 @@ if [ -f /var/db/locate.database ]; then
nice -5 su -m nobody 2>/dev/null 1>$TMP
if [ -s "$TMP" ]; then
chmod 444 $TMP
- chown root.wheel $TMP
+ chown root:wheel $TMP
mv -f $TMP /var/db/locate.database
else
echo "Not installing locate database; zero size"
diff --git a/games/phantasia/Makefile b/games/phantasia/Makefile
index 12436d5c706..3285150854d 100644
--- a/games/phantasia/Makefile
+++ b/games/phantasia/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2002/05/23 18:43:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.15 2003/04/08 20:42:42 millert Exp $
PROG= phantasia
SRCS= main.c fight.c io.c interplayer.c gamesupport.c misc.c phantglobs.c
@@ -22,7 +22,7 @@ setup: phantglobs.o.bld setup.o monsters.asc ${DPADD}
beforeinstall:
./setup -m ${.CURDIR}/monsters.asc
- chown root.games ${DESTDIR}/var/games/phantasia/*
+ chown root:games ${DESTDIR}/var/games/phantasia/*
# Make Phantasia map. Change the map commands reflect your installation.
# PLOTDEVICE is used for plotting the map. Change as appropriate.
diff --git a/regress/etc/MAKEDEV/Makefile b/regress/etc/MAKEDEV/Makefile
index fe3ebd5207a..a182c23ea22 100644
--- a/regress/etc/MAKEDEV/Makefile
+++ b/regress/etc/MAKEDEV/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.14 2002/12/31 16:22:25 miod Exp $
+# $OpenBSD: Makefile,v 1.15 2003/04/08 20:42:43 millert Exp $
MAKEDEVARCHS+=alpha hp300 hppa i386 mac68k macppc mvme68k mvme88k
MAKEDEVARCHS+=mvmeppc sparc sparc64 vax
@@ -22,7 +22,7 @@ ${REGRESS_TARGETS}:
@exec ${SUDO} rm -rf test.${_T}.${.TARGET}
@exec mkdir -p -m 700 test.${_T}.${.TARGET}
@exec cp ${ETCSRCDIR}/etc.${.TARGET}/MAKEDEV test.${_T}.${.TARGET}
- @exec ${SUDO} chown root.wheel test.${_T}.${.TARGET}
+ @exec ${SUDO} chown root:wheel test.${_T}.${.TARGET}
@cd test.${_T}.${.TARGET}; \
time ${SUDO} sh ./MAKEDEV ${_T} || true; \
time ${SUDO} sh ./MAKEDEV ${_T} || true; \