In ssh check, ensure that ${DESTDIR}/etc/moduli is up to date.

Supports either ${SRCDIR}/crypto/dist/ssh (if using -s on a src tree)
or ${SRCDIR}/etc (if using -s on an extracted etc.tgz set) for the
"source" location of moduli.
This commit is contained in:
lukem 2002-11-17 01:04:46 +00:00
parent 93df539f73
commit 1be07ae391

View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $NetBSD: postinstall,v 1.35 2002/11/17 00:49:54 lukem Exp $
# $NetBSD: postinstall,v 1.36 2002/11/17 01:04:46 lukem Exp $
#
# Copyright (c) 2002 The NetBSD Foundation, Inc.
# All rights reserved.
@ -49,7 +49,6 @@
# - support quiet/verbose mode ?
# - check obsolete file lists -- need to remove non obsolete files from
# the sets first.
# - etc/moduli
#
#
@ -473,6 +472,25 @@ do_ssh()
fi
fi
dirsrc=${SRC_DIR}/crypto/dist/ssh
diretc=${SRC_DIR}/etc
modulidir=
if [ -f "${dirsrc}"/moduli ]; then
modulidir=$dirsrc
elif [ -f "${diretc}"/moduli ]; then
modulidir=$diretc
msg "Checking for moduli from ${modulidir} instead of ${dirsrc}"
else
msg "Can't find source directory for etc/moduli"
failed=1
fi
if [ -n "${modulidir}" ]; then
if ! compare_dir ${op} ${modulidir} \
${DEST_DIR}/etc 444 moduli; then
failed=1
fi
fi
if ! check_dir "${op}" "${DEST_DIR}/var/chroot/sshd" 755 ; then
failed=1
fi