use /var/chroot/sshd instead of /var/empty. suggested by christos

This commit is contained in:
itojun 2002-05-16 20:59:35 +00:00
parent 5d6d9530b6
commit e26b1052bb
5 changed files with 11 additions and 10 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: pathnames.h,v 1.11 2002/04/29 08:23:35 lukem Exp $ */
/* $NetBSD: pathnames.h,v 1.12 2002/05/16 20:59:37 itojun Exp $ */
/* $OpenBSD: pathnames.h,v 1.12 2002/03/19 03:03:43 stevesk Exp $ */
/*
@ -125,7 +125,7 @@
#define _PATH_LS "ls"
/* chroot directory for unprivileged user when UsePrivilegeSeparation=yes */
#define _PATH_PRIVSEP_CHROOT_DIR "/var/empty"
#define _PATH_PRIVSEP_CHROOT_DIR "/var/chroot/sshd"
#define _PATH_RSH "/usr/bin/rsh"
#define _PATH_URANDOM "/dev/urandom"

View File

@ -1,4 +1,4 @@
# $NetBSD: mi,v 1.321 2002/05/14 23:26:24 itojun Exp $
# $NetBSD: mi,v 1.322 2002/05/16 20:59:37 itojun Exp $
. base-sys-root
./altroot base-sys-root
./bin base-sys-root
@ -2387,12 +2387,12 @@
./var/chroot/ntpd/var base-ntp-root
./var/chroot/ntpd/var/db base-ntp-root
./var/chroot/ntpd/var/run base-ntp-root
./var/chroot/sshd base-sys-root
./var/crash base-sys-root
./var/cron base-cron-root
./var/cron/tabs base-cron-root
./var/db base-sys-root
./var/db/ns base-sys-root
./var/empty base-sys-root
./var/games base-games-root
./var/games/hackdir base-games-root
./var/games/hackdir/save base-games-root

View File

@ -1,4 +1,4 @@
# $NetBSD: obsolete.mi,v 1.44 2002/05/02 17:03:58 wiz Exp $
# $NetBSD: obsolete.mi,v 1.45 2002/05/16 20:59:37 itojun Exp $
/bin/rcorder
/dev/i4b
/dev/i4bctl
@ -187,6 +187,7 @@
/usr/share/zoneinfo/GMT8
/usr/share/zoneinfo/GMT9
/usr/share/zoneinfo/Moscow
/var/empty
/var/games/save
/var/named
/var/named/dev

View File

@ -1,4 +1,4 @@
# $NetBSD: NetBSD.dist,v 1.190 2002/05/14 23:26:24 itojun Exp $
# $NetBSD: NetBSD.dist,v 1.191 2002/05/16 20:59:36 itojun Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
/set type=dir uname=root gname=wheel mode=0755
@ -772,6 +772,7 @@
./var/chroot/ntpd/var
./var/chroot/ntpd/var/db mode=0775 gname=ntpd
./var/chroot/ntpd/var/run mode=0775 gname=ntpd
./var/chroot/sshd mode=0755
./var/crash mode=0770
./var/cron
./var/cron/tabs mode=0700
@ -783,7 +784,6 @@
./var/games/larn uname=games gname=games mode=0775
./var/games/phantasia uname=games gname=games mode=0775
./var/games/sail uname=games gname=games mode=0775
./var/empty mode=0755
./var/heimdal
./var/log
./var/log/rdist

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $NetBSD: postinstall,v 1.14 2002/05/14 23:35:35 itojun Exp $
# $NetBSD: postinstall,v 1.15 2002/05/16 20:59:35 itojun Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@ -379,8 +379,8 @@ do_ssh()
fi
fi
if [ ! -d /var/empty ]; then
msg "/var/empty has to be present."
if [ ! -d /var/chroot/sshd ]; then
msg "/var/chroot/sshd has to be present."
failed=1
fi