diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-09-09 20:41:25 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-09-09 20:41:25 +1000 |
commit | 733a292c1125b070a2e49e3e514912460966a03e (patch) | |
tree | 91e9fa57c73e5291b4b94db1ab162d61b6a80660 /buildpkg.sh.in | |
parent | 19a66dbf4f929c0d9aa89af5b2282470cfb5726b (diff) |
- (dtucker) [buildpkg.sh.in] Always create privsep user. ok djm@
Diffstat (limited to 'buildpkg.sh.in')
-rw-r--r-- | buildpkg.sh.in | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/buildpkg.sh.in b/buildpkg.sh.in index 31db10d66..a3960cb89 100644 --- a/buildpkg.sh.in +++ b/buildpkg.sh.in | |||
@@ -311,14 +311,7 @@ then | |||
311 | chroot=echo | 311 | chroot=echo |
312 | fi | 312 | fi |
313 | 313 | ||
314 | if egrep '^[ \t]*UsePrivilegeSeparation[ \t]+no' \${PKG_INSTALL_ROOT}/$sysconfdir/sshd_config >/dev/null | 314 | echo "PrivilegeSeparation user always required." |
315 | then | ||
316 | echo "UsePrivilegeSeparation disabled in config, not creating PrivSep user" | ||
317 | echo "or group." | ||
318 | else | ||
319 | echo "UsePrivilegeSeparation enabled in config (or defaulting to on)." | ||
320 | |||
321 | # user required? | ||
322 | if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null | 315 | if cut -f1 -d: \${PKG_INSTALL_ROOT}/etc/passwd | egrep '^'$SSH_PRIVSEP_USER'\$' >/dev/null |
323 | then | 316 | then |
324 | echo "PrivSep user $SSH_PRIVSEP_USER already exists." | 317 | echo "PrivSep user $SSH_PRIVSEP_USER already exists." |
@@ -363,7 +356,6 @@ else | |||
363 | \$chroot ${PATH_USERADD_PROG} -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER | 356 | \$chroot ${PATH_USERADD_PROG} -c 'SSHD PrivSep User' -s /bin/false -g $SSH_PRIVSEP_USER \$sshduid $SSH_PRIVSEP_USER |
364 | \$chroot ${PATH_PASSWD_PROG} -l $SSH_PRIVSEP_USER | 357 | \$chroot ${PATH_PASSWD_PROG} -l $SSH_PRIVSEP_USER |
365 | } | 358 | } |
366 | fi | ||
367 | 359 | ||
368 | [ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start | 360 | [ "\${POST_INS_START}" = "yes" ] && ${TEST_DIR}/etc/init.d/${SYSVINIT_NAME} start |
369 | exit 0 | 361 | exit 0 |