From e26b1052bb4798184545061ced326c6096be1c4a Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Thu, 16 May 2002 20:59:35 +0000
Subject: [PATCH] use /var/chroot/sshd instead of /var/empty.  suggested by
 christos

---
 crypto/dist/ssh/pathnames.h         | 4 ++--
 distrib/sets/lists/base/mi          | 4 ++--
 distrib/sets/lists/base/obsolete.mi | 3 ++-
 etc/mtree/NetBSD.dist               | 4 ++--
 etc/postinstall                     | 6 +++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/crypto/dist/ssh/pathnames.h b/crypto/dist/ssh/pathnames.h
index 191649861e6a..9d73b1b9852f 100644
--- a/crypto/dist/ssh/pathnames.h
+++ b/crypto/dist/ssh/pathnames.h
@@ -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"
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 19fb48aab5ce..0675eed2972c 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -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
diff --git a/distrib/sets/lists/base/obsolete.mi b/distrib/sets/lists/base/obsolete.mi
index 5da8458f9892..b4a49a495f21 100644
--- a/distrib/sets/lists/base/obsolete.mi
+++ b/distrib/sets/lists/base/obsolete.mi
@@ -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
diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist
index 03c915d051bd..4b674a97d319 100644
--- a/etc/mtree/NetBSD.dist
+++ b/etc/mtree/NetBSD.dist
@@ -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
diff --git a/etc/postinstall b/etc/postinstall
index a4150d6db9e6..3610002d2f46 100755
--- a/etc/postinstall
+++ b/etc/postinstall
@@ -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