summaryrefslogtreecommitdiff
path: root/buildpkg.sh.in
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-09 20:41:25 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-09 20:41:25 +1000
commit733a292c1125b070a2e49e3e514912460966a03e (patch)
tree91e9fa57c73e5291b4b94db1ab162d61b6a80660 /buildpkg.sh.in
parent19a66dbf4f929c0d9aa89af5b2282470cfb5726b (diff)
downloadopenssh-git-733a292c1125b070a2e49e3e514912460966a03e.tar.gz
- (dtucker) [buildpkg.sh.in] Always create privsep user. ok djm@
Diffstat (limited to 'buildpkg.sh.in')
-rw-r--r--buildpkg.sh.in10
1 files changed, 1 insertions, 9 deletions
diff --git a/buildpkg.sh.in b/buildpkg.sh.in
index 31db10d6..a3960cb8 100644
--- a/buildpkg.sh.in
+++ b/buildpkg.sh.in
@@ -311,14 +311,7 @@ then
chroot=echo
fi
-if egrep '^[ \t]*UsePrivilegeSeparation[ \t]+no' \${PKG_INSTALL_ROOT}/$sysconfdir/sshd_config >/dev/null
-then
- echo "UsePrivilegeSeparation disabled in config, not creating PrivSep user"
- echo "or group."
-else
- echo "UsePrivilegeSeparation enabled in config (or defaulting to on)."
-
- # user required?
+ echo "PrivilegeSeparation user always required."
if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null
then
echo "PrivSep user $SSH_PRIVSEP_USER already exists."
@@ -363,7 +356,6 @@ else
\$chroot ${PATH_USERADD_PROG} -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER
\$chroot ${PATH_PASSWD_PROG} -l $SSH_PRIVSEP_USER
}
-fi
[ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start
exit 0