diff options
author | Damien Miller <djm@mindrot.org> | 2008-02-10 22:44:20 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-02-10 22:44:20 +1100 |
commit | 62ca18d12fc815e760e8c73fcce764fef405b313 (patch) | |
tree | 7c3b9ef37bca605f5bff746906ac051fed6bba04 | |
parent | d8cb1f184f9acaae02bb4d15ce1e00ffbeeeac88 (diff) |
- djm@cvs.openbsd.org 2008/02/08 23:24:07
[servconf.c servconf.h session.c sftp-server.c sftp.h sshd_config]
[sshd_config.5]
add sshd_config ChrootDirectory option to chroot(2) users to a directory
and tweak internal sftp server to work with it (no special files in chroot
required). ok markus@
-rw-r--r-- | Makefile.in | 4 | ||||
-rw-r--r-- | sftp-server.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 1f78ea9c..8049f142 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.286 2008/02/10 11:40:12 djm Exp $ +# $Id: Makefile.in,v 1.287 2008/02/10 11:44:20 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -86,7 +86,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ auth-krb5.o \ auth2-gss.o gss-serv.o gss-serv-krb5.o \ loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ - audit.o audit-bsm.o platform.o + audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 diff --git a/sftp-server.c b/sftp-server.c index 44ccefff..d3ae5442 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1230,9 +1230,6 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) extern char *optarg; extern char *__progname; - /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ - sanitise_stdfd(); - __progname = ssh_get_progname(argv[0]); log_init(__progname, log_level, log_facility, log_stderr); |