diff options
-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 1f78ea9cc..8049f1423 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.286 2008/02/10 11:40:12 djm Exp $ | 1 | # $Id: Makefile.in,v 1.287 2008/02/10 11:44:20 djm Exp $ |
2 | 2 | ||
3 | # uncomment if you run a non bourne compatable shell. Ie. csh | 3 | # uncomment if you run a non bourne compatable shell. Ie. csh |
4 | #SHELL = @SH@ | 4 | #SHELL = @SH@ |
@@ -86,7 +86,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passwd.o auth-rsa.o auth-rh-rsa.o \ | |||
86 | auth-krb5.o \ | 86 | auth-krb5.o \ |
87 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ | 87 | auth2-gss.o gss-serv.o gss-serv-krb5.o \ |
88 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ | 88 | loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \ |
89 | audit.o audit-bsm.o platform.o | 89 | audit.o audit-bsm.o platform.o sftp-server.o sftp-common.o |
90 | 90 | ||
91 | 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 | 91 | 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 |
92 | 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 | 92 | 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 44ccefff8..d3ae54428 100644 --- a/sftp-server.c +++ b/sftp-server.c | |||
@@ -1230,9 +1230,6 @@ sftp_server_main(int argc, char **argv, struct passwd *user_pw) | |||
1230 | extern char *optarg; | 1230 | extern char *optarg; |
1231 | extern char *__progname; | 1231 | extern char *__progname; |
1232 | 1232 | ||
1233 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | ||
1234 | sanitise_stdfd(); | ||
1235 | |||
1236 | __progname = ssh_get_progname(argv[0]); | 1233 | __progname = ssh_get_progname(argv[0]); |
1237 | log_init(__progname, log_level, log_facility, log_stderr); | 1234 | log_init(__progname, log_level, log_facility, log_stderr); |
1238 | 1235 | ||