cleanup diffs

3 files changed, 5 insertions, 4 deletions

diff --git a/auth.c b/auth.c
index c3baa962f..0a58df58b 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 79bdf77ba..58e901de8 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 bf4f8b1c6..1cc8dbbf3 100644
--- a/ssh.c
+++ b/ssh.c
@@ -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