diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-18 02:04:35 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-01-18 02:04:35 +0000 |
commit | bf555ba6210532f8598ff0f96961e82bcda3f09b (patch) | |
tree | 2b90d1026f300a2dd478c654e5e47ada304c3ffe /session.c | |
parent | 01fa6380e815a37ac5ffcf03b04c93d7b52ce765 (diff) |
NOTE: This update changes the RSA key generation. *NEW RSA KEYS
NEED TO BE GENERATED* =) Refer to to entry "2001/01/16 19:20:06"
for more details.
20010118
- (bal) Super Sized OpenBSD Resync
- markus@cvs.openbsd.org 2001/01/11 22:14:20 GMT 2001 by markus
[sshd.c]
maxfd+1
- markus@cvs.openbsd.org 2001/01/13 17:59:18
[ssh-keygen.1]
small ssh-keygen manpage cleanup; stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:03:07
[scp.c ssh-keygen.c sshd.c]
getopt() returns -1 not EOF; stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:06:54
[ssh-keyscan.c]
use SSH_DEFAULT_PORT; from stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:12:47
[ssh-keyscan.c]
free() -> xfree(); fix memory leak; from stevesk@pobox.com
- markus@cvs.openbsd.org 2001/01/13 18:14:13
[ssh-add.c]
typo, from stevesk@sweden.hp.com
- markus@cvs.openbsd.org 2001/01/13 18:32:50
[packet.c session.c ssh.c sshconnect.c sshd.c]
split out keepalive from packet_interactive (from dale@accentre.com)
set IPTOS_LOWDELAY TCP_NODELAY IPTOS_THROUGHPUT for ssh2, too.
- markus@cvs.openbsd.org 2001/01/13 18:36:45
[packet.c packet.h]
reorder, typo
- markus@cvs.openbsd.org 2001/01/13 18:38:00
[auth-options.c]
fix comment
- markus@cvs.openbsd.org 2001/01/13 18:43:31
[session.c]
Wall
- markus@cvs.openbsd.org 2001/01/13 19:14:08
[clientloop.h clientloop.c ssh.c]
move callback to headerfile
- markus@cvs.openbsd.org 2001/01/15 21:40:10
[ssh.c]
use log() instead of stderr
- markus@cvs.openbsd.org 2001/01/15 21:43:51
[dh.c]
use error() not stderr!
- markus@cvs.openbsd.org 2001/01/15 21:45:29
[sftp-server.c]
rename must fail if newpath exists, debug off by default
- markus@cvs.openbsd.org 2001/01/15 21:46:38
[sftp-server.c]
readable long listing for sftp-server, ok deraadt@
- markus@cvs.openbsd.org 2001/01/16 19:20:06
[key.c ssh-rsa.c]
make "ssh-rsa" key format for ssh2 confirm to the ietf-drafts; from
galb@vandyke.com. note that you have to delete older ssh2-rsa keys,
since they are in the wrong format, too. they must be removed from
.ssh/authorized_keys2 and .ssh/known_hosts2, etc.
(cd; grep -v ssh-rsa .ssh/authorized_keys2 > TMP && mv TMP
.ssh/authorized_keys2) additionally, we now check that
BN_num_bits(rsa->n) >= 768.
- markus@cvs.openbsd.org 2001/01/16 20:54:27
[sftp-server.c]
remove some statics. simpler handles; idea from nisse@lysator.liu.se
- deraadt@cvs.openbsd.org 2001/01/16 23:58:08
[bufaux.c radix.c sshconnect.h sshconnect1.c]
indent
- (bal) Added bsd-strmode.[ch] since some non-OpenBSD platforms may
be missing such feature.
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -33,7 +33,7 @@ | |||
33 | */ | 33 | */ |
34 | 34 | ||
35 | #include "includes.h" | 35 | #include "includes.h" |
36 | RCSID("$OpenBSD: session.c,v 1.46 2001/01/04 22:41:03 markus Exp $"); | 36 | RCSID("$OpenBSD: session.c,v 1.48 2001/01/13 18:43:31 markus Exp $"); |
37 | 37 | ||
38 | #include "xmalloc.h" | 38 | #include "xmalloc.h" |
39 | #include "ssh.h" | 39 | #include "ssh.h" |
@@ -405,10 +405,6 @@ do_authenticated(struct passwd * pw) | |||
405 | 405 | ||
406 | case SSH_CMSG_EXEC_SHELL: | 406 | case SSH_CMSG_EXEC_SHELL: |
407 | case SSH_CMSG_EXEC_CMD: | 407 | case SSH_CMSG_EXEC_CMD: |
408 | /* Set interactive/non-interactive mode. */ | ||
409 | packet_set_interactive(have_pty || s->display != NULL, | ||
410 | options.keepalives); | ||
411 | |||
412 | if (type == SSH_CMSG_EXEC_CMD) { | 408 | if (type == SSH_CMSG_EXEC_CMD) { |
413 | command = packet_get_string(&dlen); | 409 | command = packet_get_string(&dlen); |
414 | debug("Exec command '%.500s'", command); | 410 | debug("Exec command '%.500s'", command); |
@@ -548,6 +544,8 @@ do_exec_no_pty(Session *s, const char *command, struct passwd * pw) | |||
548 | if (pid < 0) | 544 | if (pid < 0) |
549 | packet_disconnect("fork failed: %.100s", strerror(errno)); | 545 | packet_disconnect("fork failed: %.100s", strerror(errno)); |
550 | s->pid = pid; | 546 | s->pid = pid; |
547 | /* Set interactive/non-interactive mode. */ | ||
548 | packet_set_interactive(s->display != NULL); | ||
551 | #ifdef USE_PIPES | 549 | #ifdef USE_PIPES |
552 | /* We are the parent. Close the child sides of the pipes. */ | 550 | /* We are the parent. Close the child sides of the pipes. */ |
553 | close(pin[0]); | 551 | close(pin[0]); |
@@ -665,6 +663,7 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw) | |||
665 | s->ptymaster = ptymaster; | 663 | s->ptymaster = ptymaster; |
666 | 664 | ||
667 | /* Enter interactive session. */ | 665 | /* Enter interactive session. */ |
666 | packet_set_interactive(1); | ||
668 | if (compat20) { | 667 | if (compat20) { |
669 | session_set_fds(s, ptyfd, fdout, -1); | 668 | session_set_fds(s, ptyfd, fdout, -1); |
670 | } else { | 669 | } else { |