diff options
author | Damien Miller <djm@mindrot.org> | 2000-05-20 15:22:36 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-05-20 15:22:36 +1000 |
commit | 7d6656c1283f46d9cdbba707ea2373af3d994585 (patch) | |
tree | 3bfb2579c72abe93e737802cf8dd3f97b747811a | |
parent | dfc83f42eba83d6dd127ce36fb33a490163c32de (diff) |
cleanup diffs
-rw-r--r-- | auth.c | 1 | ||||
-rw-r--r-- | serverloop.c | 4 | ||||
-rw-r--r-- | ssh.c | 4 |
3 files changed, 5 insertions, 4 deletions
@@ -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(); @@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.31 2000/05/17 12:34:24 damien Exp $"); +RCSID("$Id: ssh.c,v 1.32 2000/05/20 05:22:37 damien Exp $"); #include <openssl/evp.h> #include <openssl/dsa.h> @@ -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 |