diff options
author | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-06-12 16:16:35 +0000 |
commit | b7e40fa9da0b5491534a429dadb321eab5a77558 (patch) | |
tree | bed1da11e9f829925797aa093e379fc0b5868ecd /ttymodes.c | |
parent | 4f84beedf1005e44ff33c854abd6b711ffc0adb7 (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
* New upstream release (closes: #395507, #397961, #420035). Important
changes not previously backported to 4.3p2:
- 4.4/4.4p1 (http://www.openssh.org/txt/release-4.4):
+ On portable OpenSSH, fix a GSSAPI authentication abort that could be
used to determine the validity of usernames on some platforms.
+ Implemented conditional configuration in sshd_config(5) using the
"Match" directive. This allows some configuration options to be
selectively overridden if specific criteria (based on user, group,
hostname and/or address) are met. So far a useful subset of
post-authentication options are supported and more are expected to
be added in future releases.
+ Add support for Diffie-Hellman group exchange key agreement with a
final hash of SHA256.
+ Added a "ForceCommand" directive to sshd_config(5). Similar to the
command="..." option accepted in ~/.ssh/authorized_keys, this forces
the execution of the specified command regardless of what the user
requested. This is very useful in conjunction with the new "Match"
option.
+ Add a "PermitOpen" directive to sshd_config(5). This mirrors the
permitopen="..." authorized_keys option, allowing fine-grained
control over the port-forwardings that a user is allowed to
establish.
+ Add optional logging of transactions to sftp-server(8).
+ ssh(1) will now record port numbers for hosts stored in
~/.ssh/known_hosts when a non-standard port has been requested
(closes: #50612).
+ Add an "ExitOnForwardFailure" option to cause ssh(1) to exit (with a
non-zero exit code) when requested port forwardings could not be
established.
+ Extend sshd_config(5) "SubSystem" declarations to allow the
specification of command-line arguments.
+ Replacement of all integer overflow susceptible invocations of
malloc(3) and realloc(3) with overflow-checking equivalents.
+ Many manpage fixes and improvements.
+ Add optional support for OpenSSL hardware accelerators (engines),
enabled using the --with-ssl-engine configure option.
+ Tokens in configuration files may be double-quoted in order to
contain spaces (closes: #319639).
+ Move a debug() call out of a SIGCHLD handler, fixing a hang when the
session exits very quickly (closes: #307890).
+ Fix some incorrect buffer allocation calculations (closes: #410599).
+ ssh-add doesn't ask for a passphrase if key file permissions are too
liberal (closes: #103677).
+ Likewise, ssh doesn't ask either (closes: #99675).
- 4.6/4.6p1 (http://www.openssh.org/txt/release-4.6):
+ sshd now allows the enabling and disabling of authentication methods
on a per user, group, host and network basis via the Match directive
in sshd_config.
+ Fixed an inconsistent check for a terminal when displaying scp
progress meter (closes: #257524).
+ Fix "hang on exit" when background processes are running at the time
of exit on a ttyful/login session (closes: #88337).
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.6p1-gsskex-20070312.patch;
install ChangeLog.gssapi.
Diffstat (limited to 'ttymodes.c')
-rw-r--r-- | ttymodes.c | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/ttymodes.c b/ttymodes.c index cf4c7d5c6..d8e2c553a 100644 --- a/ttymodes.c +++ b/ttymodes.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: ttymodes.c,v 1.26 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -43,14 +44,19 @@ | |||
43 | */ | 44 | */ |
44 | 45 | ||
45 | #include "includes.h" | 46 | #include "includes.h" |
46 | RCSID("$OpenBSD: ttymodes.c,v 1.19 2003/04/08 20:21:29 itojun Exp $"); | 47 | |
48 | #include <sys/types.h> | ||
49 | |||
50 | #include <errno.h> | ||
51 | #include <string.h> | ||
52 | #include <termios.h> | ||
53 | #include <stdarg.h> | ||
47 | 54 | ||
48 | #include "packet.h" | 55 | #include "packet.h" |
49 | #include "log.h" | 56 | #include "log.h" |
50 | #include "ssh1.h" | 57 | #include "ssh1.h" |
51 | #include "compat.h" | 58 | #include "compat.h" |
52 | #include "buffer.h" | 59 | #include "buffer.h" |
53 | #include "bufaux.h" | ||
54 | 60 | ||
55 | #define TTY_OP_END 0 | 61 | #define TTY_OP_END 0 |
56 | /* | 62 | /* |
@@ -384,7 +390,8 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
384 | n_bytes += 4; | 390 | n_bytes += 4; |
385 | baud = packet_get_int(); | 391 | baud = packet_get_int(); |
386 | debug3("tty_parse_modes: ispeed %d", baud); | 392 | debug3("tty_parse_modes: ispeed %d", baud); |
387 | if (failure != -1 && cfsetispeed(&tio, baud_to_speed(baud)) == -1) | 393 | if (failure != -1 && |
394 | cfsetispeed(&tio, baud_to_speed(baud)) == -1) | ||
388 | error("cfsetispeed failed for %d", baud); | 395 | error("cfsetispeed failed for %d", baud); |
389 | break; | 396 | break; |
390 | 397 | ||
@@ -394,7 +401,8 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
394 | n_bytes += 4; | 401 | n_bytes += 4; |
395 | baud = packet_get_int(); | 402 | baud = packet_get_int(); |
396 | debug3("tty_parse_modes: ospeed %d", baud); | 403 | debug3("tty_parse_modes: ospeed %d", baud); |
397 | if (failure != -1 && cfsetospeed(&tio, baud_to_speed(baud)) == -1) | 404 | if (failure != -1 && |
405 | cfsetospeed(&tio, baud_to_speed(baud)) == -1) | ||
398 | error("cfsetospeed failed for %d", baud); | 406 | error("cfsetospeed failed for %d", baud); |
399 | break; | 407 | break; |
400 | 408 | ||
@@ -442,11 +450,12 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
442 | /* | 450 | /* |
443 | * It is a truly undefined opcode (160 to 255). | 451 | * It is a truly undefined opcode (160 to 255). |
444 | * We have no idea about its arguments. So we | 452 | * We have no idea about its arguments. So we |
445 | * must stop parsing. Note that some data may be | 453 | * must stop parsing. Note that some data |
446 | * left in the packet; hopefully there is nothing | 454 | * may be left in the packet; hopefully there |
447 | * more coming after the mode data. | 455 | * is nothing more coming after the mode data. |
448 | */ | 456 | */ |
449 | logit("parse_tty_modes: unknown opcode %d", opcode); | 457 | logit("parse_tty_modes: unknown opcode %d", |
458 | opcode); | ||
450 | goto set; | 459 | goto set; |
451 | } | 460 | } |
452 | } else { | 461 | } else { |
@@ -462,7 +471,8 @@ tty_parse_modes(int fd, int *n_bytes_ptr) | |||
462 | (void) packet_get_int(); | 471 | (void) packet_get_int(); |
463 | break; | 472 | break; |
464 | } else { | 473 | } else { |
465 | logit("parse_tty_modes: unknown opcode %d", opcode); | 474 | logit("parse_tty_modes: unknown opcode %d", |
475 | opcode); | ||
466 | goto set; | 476 | goto set; |
467 | } | 477 | } |
468 | } | 478 | } |