From ff873e9823e7f26ae836592cc7f2fbebb329c9c2 Mon Sep 17 00:00:00 2001 From: damien Date: Sat, 20 May 2000 05:22:36 +0000 Subject: [PATCH] cleanup diffs --- auth.c | 1 - serverloop.c | 4 +++- ssh.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/auth.c b/auth.c index c3baa962..0a58df58 100644 --- a/auth.c +++ b/auth.c @@ -58,7 +58,6 @@ allowed_user(struct passwd * pw) if (!pw) return 0; - /* deny if shell does not exists or is not executable */ /* * Get the shell from the password data. An empty shell field is * legal, and means /bin/sh. diff --git a/serverloop.c b/serverloop.c index 79bdf77b..58e901de 100644 --- a/serverloop.c +++ b/serverloop.c @@ -402,7 +402,9 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg) /* nonblocking IO */ set_nonblock(fdin); set_nonblock(fdout); - set_nonblock(fderr); + /* we don't have stderr for interactive terminal sessions, see below */ + if (fderr != -1) + set_nonblock(fderr); connection_in = packet_get_connection_in(); connection_out = packet_get_connection_out(); diff --git a/ssh.c b/ssh.c index 97c0de7b..28d4e82d 100644 --- a/ssh.c +++ b/ssh.c @@ -435,7 +435,7 @@ main(int ac, char **av) buffer_init(&command); OpenSSL_add_all_algorithms(); - + /* * Save the command to execute on the remote host in a buffer. There * is no limit on the length of the command, except by the maximum -- 2.45.2