merge 5.6p1

1 files changed, 25 insertions, 21 deletions

diff --git a/session.c b/session.c
index e032de692..71e4fbe7c 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.252 2010/03/07 11:57:13 dtucker Exp $ */
+/* $OpenBSD: session.c,v 1.256 2010/06/25 07:20:04 djm Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -47,6 +47,7 @@
 #include <arpa/inet.h>
 
 #include <errno.h>
+#include <fcntl.h>
 #include <grp.h>
 #ifdef HAVE_PATHS_H
 #include <paths.h>
@@ -104,7 +105,7 @@
 /* func */
 
 Session *session_new(void);
-void    session_set_fds(Session *, int, int, int, int);
+void    session_set_fds(Session *, int, int, int, int, int);
 void    session_pty_cleanup(Session *);
 void    session_proctitle(Session *);
 int     session_setup_x11fwd(Session *);
@@ -447,6 +448,9 @@ do_exec_no_pty(Session *s, const char *command)
 #ifdef USE_PIPES
         int pin[2], pout[2], perr[2];
 
+        if (s == NULL)
+                fatal("do_exec_no_pty: no session");
+
         /* Allocate pipes for communicating with the program. */
         if (pipe(pin) < 0) {
                 error("%s: pipe in: %.100s", __func__, strerror(errno));
@@ -459,7 +463,8 @@ do_exec_no_pty(Session *s, const char *command)
                 return -1;
         }
         if (pipe(perr) < 0) {
-                error("%s: pipe err: %.100s", __func__, strerror(errno));
+                error("%s: pipe err: %.100s", __func__,
+                    strerror(errno));
                 close(pin[0]);
                 close(pin[1]);
                 close(pout[0]);
@@ -469,22 +474,23 @@ do_exec_no_pty(Session *s, const char *command)
 #else
         int inout[2], err[2];
 
+        if (s == NULL)
+                fatal("do_exec_no_pty: no session");
+
         /* Uses socket pairs to communicate with the program. */
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, inout) < 0) {
                 error("%s: socketpair #1: %.100s", __func__, strerror(errno));
                 return -1;
         }
         if (socketpair(AF_UNIX, SOCK_STREAM, 0, err) < 0) {
-                error("%s: socketpair #2: %.100s", __func__, strerror(errno));
+                error("%s: socketpair #2: %.100s", __func__,
+                    strerror(errno));
                 close(inout[0]);
                 close(inout[1]);
                 return -1;
         }
 #endif
 
-        if (s == NULL)
-                fatal("do_exec_no_pty: no session");
-
         session_proctitle(s);
 
         /* Fork the child. */
@@ -595,11 +601,8 @@ do_exec_no_pty(Session *s, const char *command)
         close(perr[1]);
 
         if (compat20) {
-                if (s->is_subsystem) {
-                        close(perr[0]);
-                        perr[0] = -1;
-                }
-                session_set_fds(s, pin[1], pout[0], perr[0], 0);
+                session_set_fds(s, pin[1], pout[0], perr[0],
+                    s->is_subsystem, 0);
         } else {
                 /* Enter the interactive session. */
                 server_loop(pid, pin[1], pout[0], perr[0]);
@@ -615,10 +618,8 @@ do_exec_no_pty(Session *s, const char *command)
          * handle the case that fdin and fdout are the same.
          */
         if (compat20) {
-                session_set_fds(s, inout[1], inout[1],
-                    s->is_subsystem ? -1 : err[1], 0);
-                if (s->is_subsystem)
-                        close(err[1]);
+                session_set_fds(s, inout[1], inout[1], err[1],
+                    s->is_subsystem, 0);
         } else {
                 server_loop(pid, inout[1], inout[1], err[1]);
                 /* server_loop has closed inout[1] and err[1]. */
@@ -740,7 +741,7 @@ do_exec_pty(Session *s, const char *command)
         s->ptymaster = ptymaster;
         packet_set_interactive(1);
         if (compat20) {
-                session_set_fds(s, ptyfd, fdout, -1, 1);
+                session_set_fds(s, ptyfd, fdout, -1, 1, 1);
         } else {
                 server_loop(pid, ptyfd, fdout, -1);
                 /* server_loop _has_ closed ptyfd and fdout. */
@@ -1792,7 +1793,8 @@ do_child(Session *s, const char *command)
 #ifdef HAVE_LOGIN_CAP
                 r = login_getcapbool(lc, "requirehome", 0);
 #endif
-                if (r || options.chroot_directory == NULL)
+                if (r || options.chroot_directory == NULL ||
+                    strcasecmp(options.chroot_directory, "none") == 0)
                         fprintf(stderr, "Could not chdir to home "
                             "directory %s: %s\n", pw->pw_dir,
                             strerror(errno));
@@ -2137,7 +2139,8 @@ session_subsystem_req(Session *s)
         u_int i;
 
         packet_check_eom();
-        logit("subsystem request for %.100s", subsys);
+        logit("subsystem request for %.100s by user %s", subsys,
+            s->pw->pw_name);
 
         for (i = 0; i < options.num_subsystems; i++) {
                 if (strcmp(subsys, options.subsystem_name[i]) == 0) {
@@ -2319,7 +2322,8 @@ session_input_channel_req(Channel *c, const char *rtype)
 }
 
 void
-session_set_fds(Session *s, int fdin, int fdout, int fderr, int is_tty)
+session_set_fds(Session *s, int fdin, int fdout, int fderr, int ignore_fderr,
+    int is_tty)
 {
         if (!compat20)
                 fatal("session_set_fds: called for proto != 2.0");
@@ -2331,7 +2335,7 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr, int is_tty)
                 fatal("no channel for session %d", s->self);
         channel_set_fds(s->chanid,
             fdout, fdin, fderr,
-            fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
+            ignore_fderr ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
             1, is_tty, CHAN_SES_WINDOW_DEFAULT);
 }