|
 |
3fdf10c |
diff -up openssh-5.5p1/session.c.stderr openssh-5.5p1/session.c
|
|
|
3fdf10c |
--- openssh-5.5p1/session.c.stderr 2010-04-26 10:35:35.000000000 +0200
|
|
|
3fdf10c |
+++ openssh-5.5p1/session.c 2010-04-26 10:41:11.000000000 +0200
|
|
|
3fdf10c |
@@ -47,6 +47,7 @@
|
|
|
3fdf10c |
#include <arpa/inet.h>
|
|
|
3fdf10c |
|
|
|
3fdf10c |
#include <errno.h>
|
|
|
3fdf10c |
+#include <fcntl.h>
|
|
|
3fdf10c |
#include <grp.h>
|
|
|
3fdf10c |
#ifdef HAVE_PATHS_H
|
|
|
3fdf10c |
#include <paths.h>
|
|
|
3fdf10c |
@@ -447,6 +448,9 @@ do_exec_no_pty(Session *s, const char *c
|
|
|
3fdf10c |
#ifdef USE_PIPES
|
|
|
3fdf10c |
int pin[2], pout[2], perr[2];
|
|
|
3fdf10c |
|
|
|
3fdf10c |
+ if (s == NULL)
|
|
|
3fdf10c |
+ fatal("do_exec_no_pty: no session");
|
|
|
3fdf10c |
+
|
|
|
3fdf10c |
/* Allocate pipes for communicating with the program. */
|
|
|
3fdf10c |
if (pipe(pin) < 0) {
|
|
|
3fdf10c |
error("%s: pipe in: %.100s", __func__, strerror(errno));
|
|
|
3fdf10c |
@@ -458,33 +462,59 @@ do_exec_no_pty(Session *s, const char *c
|
|
|
3fdf10c |
close(pin[1]);
|
|
|
3fdf10c |
return -1;
|
|
|
3fdf10c |
}
|
|
|
3fdf10c |
- if (pipe(perr) < 0) {
|
|
|
3fdf10c |
- error("%s: pipe err: %.100s", __func__, strerror(errno));
|
|
|
3fdf10c |
- close(pin[0]);
|
|
|
3fdf10c |
- close(pin[1]);
|
|
|
3fdf10c |
- close(pout[0]);
|
|
|
3fdf10c |
- close(pout[1]);
|
|
|
3fdf10c |
- return -1;
|
|
|
3fdf10c |
+ if (s->is_subsystem) {
|
|
|
3fdf10c |
+ if ((perr[1] = open(_PATH_DEVNULL, O_WRONLY)) == -1) {
|
|
|
3fdf10c |
+ error("%s: open(%s): %s", __func__, _PATH_DEVNULL,
|
|
|
3fdf10c |
+ strerror(errno));
|
|
|
3fdf10c |
+ close(pin[0]);
|
|
|
3fdf10c |
+ close(pin[1]);
|
|
|
3fdf10c |
+ close(pout[0]);
|
|
|
3fdf10c |
+ close(pout[1]);
|
|
|
3fdf10c |
+ return -1;
|
|
|
3fdf10c |
+ }
|
|
|
3fdf10c |
+ perr[0] = -1;
|
|
|
3fdf10c |
+ } else {
|
|
|
3fdf10c |
+ if (pipe(perr) < 0) {
|
|
|
3fdf10c |
+ error("%s: pipe err: %.100s", __func__,
|
|
|
3fdf10c |
+ strerror(errno));
|
|
|
3fdf10c |
+ close(pin[0]);
|
|
|
3fdf10c |
+ close(pin[1]);
|
|
|
3fdf10c |
+ close(pout[0]);
|
|
|
3fdf10c |
+ close(pout[1]);
|
|
|
3fdf10c |
+ return -1;
|
|
|
3fdf10c |
+ }
|
|
|
3fdf10c |
}
|
|
|
3fdf10c |
#else
|
|
|
3fdf10c |
int inout[2], err[2];
|
|
|
3fdf10c |
|
|
|
3fdf10c |
+ if (s == NULL)
|
|
|
3fdf10c |
+ fatal("do_exec_no_pty: no session");
|
|
|
3fdf10c |
+
|
|
|
3fdf10c |
/* Uses socket pairs to communicate with the program. */
|
|
|
3fdf10c |
if (socketpair(AF_UNIX, SOCK_STREAM, 0, inout) < 0) {
|
|
|
3fdf10c |
error("%s: socketpair #1: %.100s", __func__, strerror(errno));
|
|
|
3fdf10c |
return -1;
|
|
|
3fdf10c |
}
|
|
|
3fdf10c |
- if (socketpair(AF_UNIX, SOCK_STREAM, 0, err) < 0) {
|
|
|
3fdf10c |
- error("%s: socketpair #2: %.100s", __func__, strerror(errno));
|
|
|
3fdf10c |
- close(inout[0]);
|
|
|
3fdf10c |
- close(inout[1]);
|
|
|
3fdf10c |
- return -1;
|
|
|
3fdf10c |
+ if (s->is_subsystem) {
|
|
|
3fdf10c |
+ if ((err[0] = open(_PATH_DEVNULL, O_WRONLY)) == -1) {
|
|
|
3fdf10c |
+ error("%s: open(%s): %s", __func__, _PATH_DEVNULL,
|
|
|
3fdf10c |
+ strerror(errno));
|
|
|
3fdf10c |
+ close(inout[0]);
|
|
|
3fdf10c |
+ close(inout[1]);
|
|
|
3fdf10c |
+ return -1;
|
|
|
3fdf10c |
+ }
|
|
|
3fdf10c |
+ err[1] = -1;
|
|
|
3fdf10c |
+ } else {
|
|
|
3fdf10c |
+ if (socketpair(AF_UNIX, SOCK_STREAM, 0, err) < 0) {
|
|
|
3fdf10c |
+ error("%s: socketpair #2: %.100s", __func__,
|
|
|
3fdf10c |
+ strerror(errno));
|
|
|
3fdf10c |
+ close(inout[0]);
|
|
|
3fdf10c |
+ close(inout[1]);
|
|
|
3fdf10c |
+ return -1;
|
|
|
3fdf10c |
+ }
|
|
|
3fdf10c |
}
|
|
|
3fdf10c |
#endif
|
|
|
3fdf10c |
|
|
|
3fdf10c |
- if (s == NULL)
|
|
|
3fdf10c |
- fatal("do_exec_no_pty: no session");
|
|
|
3fdf10c |
-
|
|
|
3fdf10c |
session_proctitle(s);
|
|
|
3fdf10c |
|
|
|
3fdf10c |
/* Fork the child. */
|
|
|
3fdf10c |
@@ -496,13 +526,15 @@ do_exec_no_pty(Session *s, const char *c
|
|
|
3fdf10c |
close(pin[1]);
|
|
|
3fdf10c |
close(pout[0]);
|
|
|
3fdf10c |
close(pout[1]);
|
|
|
3fdf10c |
- close(perr[0]);
|
|
|
3fdf10c |
+ if (perr[0] != -1)
|
|
|
3fdf10c |
+ close(perr[0]);
|
|
|
3fdf10c |
close(perr[1]);
|
|
|
3fdf10c |
#else
|
|
|
3fdf10c |
close(inout[0]);
|
|
|
3fdf10c |
close(inout[1]);
|
|
|
3fdf10c |
close(err[0]);
|
|
|
3fdf10c |
- close(err[1]);
|
|
|
3fdf10c |
+ if (err[1] != -1)
|
|
|
3fdf10c |
+ close(err[1]);
|
|
|
3fdf10c |
#endif
|
|
|
3fdf10c |
return -1;
|
|
|
3fdf10c |
case 0:
|
|
|
3fdf10c |
@@ -536,7 +568,8 @@ do_exec_no_pty(Session *s, const char *c
|
|
|
3fdf10c |
close(pout[1]);
|
|
|
3fdf10c |
|
|
|
3fdf10c |
/* Redirect stderr. */
|
|
|
3fdf10c |
- close(perr[0]);
|
|
|
3fdf10c |
+ if (perr[0] != -1)
|
|
|
3fdf10c |
+ close(perr[0]);
|
|
|
3fdf10c |
if (dup2(perr[1], 2) < 0)
|
|
|
3fdf10c |
perror("dup2 stderr");
|
|
|
3fdf10c |
close(perr[1]);
|
|
|
3fdf10c |
@@ -547,7 +580,8 @@ do_exec_no_pty(Session *s, const char *c
|
|
|
3fdf10c |
* seem to depend on it.
|
|
|
3fdf10c |
*/
|
|
|
3fdf10c |
close(inout[1]);
|
|
|
3fdf10c |
- close(err[1]);
|
|
|
3fdf10c |
+ if (err[1] != -1)
|
|
|
3fdf10c |
+ close(err[1]);
|
|
|
3fdf10c |
if (dup2(inout[0], 0) < 0) /* stdin */
|
|
|
3fdf10c |
perror("dup2 stdin");
|
|
|
3fdf10c |
if (dup2(inout[0], 1) < 0) /* stdout (same as stdin) */
|
|
|
3fdf10c |
@@ -595,10 +629,6 @@ do_exec_no_pty(Session *s, const char *c
|
|
|
3fdf10c |
close(perr[1]);
|
|
|
3fdf10c |
|
|
|
3fdf10c |
if (compat20) {
|
|
|
3fdf10c |
- if (s->is_subsystem) {
|
|
|
3fdf10c |
- close(perr[0]);
|
|
|
3fdf10c |
- perr[0] = -1;
|
|
|
3fdf10c |
- }
|
|
|
3fdf10c |
session_set_fds(s, pin[1], pout[0], perr[0], 0);
|
|
|
3fdf10c |
} else {
|
|
|
3fdf10c |
/* Enter the interactive session. */
|
|
|
3fdf10c |
@@ -615,10 +645,7 @@ do_exec_no_pty(Session *s, const char *c
|
|
|
3fdf10c |
* handle the case that fdin and fdout are the same.
|
|
|
3fdf10c |
*/
|
|
|
3fdf10c |
if (compat20) {
|
|
|
3fdf10c |
- session_set_fds(s, inout[1], inout[1],
|
|
|
3fdf10c |
- s->is_subsystem ? -1 : err[1], 0);
|
|
|
3fdf10c |
- if (s->is_subsystem)
|
|
|
3fdf10c |
- close(err[1]);
|
|
|
3fdf10c |
+ session_set_fds(s, inout[1], inout[1], err[1], 0);
|
|
|
3fdf10c |
} else {
|
|
|
3fdf10c |
server_loop(pid, inout[1], inout[1], err[1]);
|
|
|
3fdf10c |
/* server_loop has closed inout[1] and err[1]. */
|