summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-07-08 01:44:00 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-07-08 01:44:00 +0000
commitba4cb70c9d1e185d070b9adf254ff32e4ffa763b (patch)
tree0cc72d46237cee11ae088f6897b64b7aebb3d683 /etc
parent9e7d3bd5a216439fdc823d501b99e686dc9085e0 (diff)
ARGH! the third part: socket handling cleanup
Diffstat (limited to 'etc')
-rw-r--r--etc/rc21
1 files changed, 1 insertions, 20 deletions
diff --git a/etc/rc b/etc/rc
index 51e15b6abbf..d1bd9d4512c 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,4 +1,4 @@
-# $OpenBSD: rc,v 1.374 2011/07/08 01:43:09 deraadt Exp $
+# $OpenBSD: rc,v 1.375 2011/07/08 01:43:59 deraadt Exp $
# System startup script run by init on autoboot
# or after single-user.
@@ -504,25 +504,6 @@ echo clearing /tmp
find . ! -name . ! -name lost+found ! -name quota.user \
! -name quota.group -execdir rm -rf -- {} \; -type d -prune)
-# create Unix sockets directories for X if needed and make sure they have
-# correct permissions
-if [ -d /usr/X11R6/lib ]; then
- for d in /tmp/.X11-unix /tmp/.ICE-unix ; do
- if [ -d $d ]; then
- if [ `ls -ld $d | cut -d' ' -f4` != root ]; then
- chown root $d
- fi
- if [ `ls -ld $d | cut -d' ' -f1` != drwxrwxrwt ]; then
- chmod 1777 $d
- fi
- elif [ -e $d ]; then
- echo "Error: $d exists and isn't a directory."
- else
- mkdir -m 1777 $d
- fi
- done
-fi
-
setup_X_sockets
[ -f /etc/rc.securelevel ] && . /etc/rc.securelevel