cleanup diffs

diff --git a/auth.c b/auth.c
index c3baa962f763121ee4cb89d2e3d3aa7b43602ec0..0a58df58bbd0f532687439a7558b5fde9e54cd61 100644 (file)
--- 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 79bdf77bace07696329e64f77082fac6619c125f..58e901de81222d961d5f18d0d160dc1266ed4f86 100644 (file)
--- 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 97c0de7b93ac3c04ff46a9c1f8d4682385d35b9e..28d4e82dd9b1698b7e642579033fc4f4fae77c09 100644 (file)
--- 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