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 /progressmeter.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 'progressmeter.c')
-rw-r--r-- | progressmeter.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/progressmeter.c b/progressmeter.c index 13c51d87e..0f95222d2 100644 --- a/progressmeter.c +++ b/progressmeter.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: progressmeter.c,v 1.37 2006/08/03 03:34:42 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Copyright (c) 2003 Nils Nordman. All rights reserved. | 3 | * Copyright (c) 2003 Nils Nordman. All rights reserved. |
3 | * | 4 | * |
@@ -23,7 +24,17 @@ | |||
23 | */ | 24 | */ |
24 | 25 | ||
25 | #include "includes.h" | 26 | #include "includes.h" |
26 | RCSID("$OpenBSD: progressmeter.c,v 1.24 2005/06/07 13:25:23 jaredy Exp $"); | 27 | |
28 | #include <sys/types.h> | ||
29 | #include <sys/ioctl.h> | ||
30 | #include <sys/uio.h> | ||
31 | |||
32 | #include <errno.h> | ||
33 | #include <signal.h> | ||
34 | #include <stdio.h> | ||
35 | #include <string.h> | ||
36 | #include <time.h> | ||
37 | #include <unistd.h> | ||
27 | 38 | ||
28 | #include "progressmeter.h" | 39 | #include "progressmeter.h" |
29 | #include "atomicio.h" | 40 | #include "atomicio.h" |
@@ -154,7 +165,7 @@ refresh_progress_meter(void) | |||
154 | len = 0; | 165 | len = 0; |
155 | if (len >= file_len + 1) | 166 | if (len >= file_len + 1) |
156 | len = file_len; | 167 | len = file_len; |
157 | for (i = len; i < file_len; i++ ) | 168 | for (i = len; i < file_len; i++) |
158 | buf[i] = ' '; | 169 | buf[i] = ' '; |
159 | buf[file_len] = '\0'; | 170 | buf[file_len] = '\0'; |
160 | } | 171 | } |
@@ -215,6 +226,7 @@ refresh_progress_meter(void) | |||
215 | last_update = now; | 226 | last_update = now; |
216 | } | 227 | } |
217 | 228 | ||
229 | /*ARGSUSED*/ | ||
218 | static void | 230 | static void |
219 | update_progress_meter(int ignore) | 231 | update_progress_meter(int ignore) |
220 | { | 232 | { |
@@ -269,6 +281,7 @@ stop_progress_meter(void) | |||
269 | atomicio(vwrite, STDOUT_FILENO, "\n", 1); | 281 | atomicio(vwrite, STDOUT_FILENO, "\n", 1); |
270 | } | 282 | } |
271 | 283 | ||
284 | /*ARGSUSED*/ | ||
272 | static void | 285 | static void |
273 | sig_winch(int sig) | 286 | sig_winch(int sig) |
274 | { | 287 | { |