diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | session.c | 24 |
2 files changed, 16 insertions, 13 deletions
@@ -7,6 +7,9 @@ | |||
7 | - markus@cvs.openbsd.org 2001/03/20 19:10:16 | 7 | - markus@cvs.openbsd.org 2001/03/20 19:10:16 |
8 | [readconf.c] | 8 | [readconf.c] |
9 | default to SSH protocol version 2 | 9 | default to SSH protocol version 2 |
10 | - markus@cvs.openbsd.org 2001/03/20 19:21:21 | ||
11 | [session.c] | ||
12 | remove unused arg | ||
10 | 13 | ||
11 | 20010321 | 14 | 20010321 |
12 | - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve | 15 | - (djm) Fix ttyname breakage for AIX and Tru64. Patch from Steve |
@@ -4666,4 +4669,4 @@ | |||
4666 | - Wrote replacements for strlcpy and mkdtemp | 4669 | - Wrote replacements for strlcpy and mkdtemp |
4667 | - Released 1.0pre1 | 4670 | - Released 1.0pre1 |
4668 | 4671 | ||
4669 | $Id: ChangeLog,v 1.1002 2001/03/22 01:24:04 mouring Exp $ | 4672 | $Id: ChangeLog,v 1.1003 2001/03/22 01:25:37 mouring Exp $ |
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.62 2001/03/20 18:57:04 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.63 2001/03/20 19:21:21 markus Exp $"); |
37 | 37 | ||
38 | #include "ssh.h" | 38 | #include "ssh.h" |
39 | #include "ssh1.h" | 39 | #include "ssh1.h" |
@@ -124,8 +124,8 @@ Session *session_new(void); | |||
124 | void session_set_fds(Session *s, int fdin, int fdout, int fderr); | 124 | void session_set_fds(Session *s, int fdin, int fdout, int fderr); |
125 | void session_pty_cleanup(Session *s); | 125 | void session_pty_cleanup(Session *s); |
126 | void session_proctitle(Session *s); | 126 | void session_proctitle(Session *s); |
127 | void do_exec_pty(Session *s, const char *command, struct passwd * pw); | 127 | void do_exec_pty(Session *s, const char *command); |
128 | void do_exec_no_pty(Session *s, const char *command, struct passwd * pw); | 128 | void do_exec_no_pty(Session *s, const char *command); |
129 | void do_login(Session *s, const char *command); | 129 | void do_login(Session *s, const char *command); |
130 | void do_child(Session *s, const char *command); | 130 | void do_child(Session *s, const char *command); |
131 | 131 | ||
@@ -421,9 +421,9 @@ do_authenticated(struct passwd * pw) | |||
421 | debug("Forced command '%.500s'", forced_command); | 421 | debug("Forced command '%.500s'", forced_command); |
422 | } | 422 | } |
423 | if (have_pty) | 423 | if (have_pty) |
424 | do_exec_pty(s, command, pw); | 424 | do_exec_pty(s, command); |
425 | else | 425 | else |
426 | do_exec_no_pty(s, command, pw); | 426 | do_exec_no_pty(s, command); |
427 | 427 | ||
428 | if (command != NULL) | 428 | if (command != NULL) |
429 | xfree(command); | 429 | xfree(command); |
@@ -457,7 +457,7 @@ do_authenticated(struct passwd * pw) | |||
457 | * setting up file descriptors and such. | 457 | * setting up file descriptors and such. |
458 | */ | 458 | */ |
459 | void | 459 | void |
460 | do_exec_no_pty(Session *s, const char *command, struct passwd * pw) | 460 | do_exec_no_pty(Session *s, const char *command) |
461 | { | 461 | { |
462 | int pid; | 462 | int pid; |
463 | 463 | ||
@@ -586,7 +586,7 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw) | |||
586 | * lastlog, and other such operations. | 586 | * lastlog, and other such operations. |
587 | */ | 587 | */ |
588 | void | 588 | void |
589 | do_exec_pty(Session *s, const char *command, struct passwd * pw) | 589 | do_exec_pty(Session *s, const char *command) |
590 | { | 590 | { |
591 | int fdout, ptyfd, ttyfd, ptymaster; | 591 | int fdout, ptyfd, ttyfd, ptymaster; |
592 | pid_t pid; | 592 | pid_t pid; |
@@ -1661,7 +1661,7 @@ session_subsystem_req(Session *s) | |||
1661 | for (i = 0; i < options.num_subsystems; i++) { | 1661 | for (i = 0; i < options.num_subsystems; i++) { |
1662 | if(strcmp(subsys, options.subsystem_name[i]) == 0) { | 1662 | if(strcmp(subsys, options.subsystem_name[i]) == 0) { |
1663 | debug("subsystem: exec() %s", options.subsystem_command[i]); | 1663 | debug("subsystem: exec() %s", options.subsystem_command[i]); |
1664 | do_exec_no_pty(s, options.subsystem_command[i], s->pw); | 1664 | do_exec_no_pty(s, options.subsystem_command[i]); |
1665 | success = 1; | 1665 | success = 1; |
1666 | } | 1666 | } |
1667 | } | 1667 | } |
@@ -1737,9 +1737,9 @@ session_shell_req(Session *s) | |||
1737 | packet_done(); | 1737 | packet_done(); |
1738 | s->extended = 1; | 1738 | s->extended = 1; |
1739 | if (s->ttyfd == -1) | 1739 | if (s->ttyfd == -1) |
1740 | do_exec_no_pty(s, shell, s->pw); | 1740 | do_exec_no_pty(s, shell); |
1741 | else | 1741 | else |
1742 | do_exec_pty(s, shell, s->pw); | 1742 | do_exec_pty(s, shell); |
1743 | return 1; | 1743 | return 1; |
1744 | } | 1744 | } |
1745 | 1745 | ||
@@ -1756,9 +1756,9 @@ session_exec_req(Session *s) | |||
1756 | } | 1756 | } |
1757 | s->extended = 1; | 1757 | s->extended = 1; |
1758 | if (s->ttyfd == -1) | 1758 | if (s->ttyfd == -1) |
1759 | do_exec_no_pty(s, command, s->pw); | 1759 | do_exec_no_pty(s, command); |
1760 | else | 1760 | else |
1761 | do_exec_pty(s, command, s->pw); | 1761 | do_exec_pty(s, command); |
1762 | if (forced_command == NULL) | 1762 | if (forced_command == NULL) |
1763 | xfree(command); | 1763 | xfree(command); |
1764 | return 1; | 1764 | return 1; |