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 /sshpty.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 'sshpty.c')
-rw-r--r-- | sshpty.c | 33 |
1 files changed, 25 insertions, 8 deletions
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: sshpty.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 |
@@ -12,18 +13,31 @@ | |||
12 | */ | 13 | */ |
13 | 14 | ||
14 | #include "includes.h" | 15 | #include "includes.h" |
15 | RCSID("$OpenBSD: sshpty.c,v 1.12 2004/06/21 17:36:31 avsm Exp $"); | ||
16 | 16 | ||
17 | #include <sys/types.h> | ||
18 | #include <sys/ioctl.h> | ||
19 | #include <sys/stat.h> | ||
20 | #include <signal.h> | ||
21 | |||
22 | #include <errno.h> | ||
23 | #include <fcntl.h> | ||
24 | #include <grp.h> | ||
25 | #ifdef HAVE_PATHS_H | ||
26 | # include <paths.h> | ||
27 | #endif | ||
28 | #include <pwd.h> | ||
29 | #include <stdarg.h> | ||
30 | #include <string.h> | ||
31 | #include <termios.h> | ||
17 | #ifdef HAVE_UTIL_H | 32 | #ifdef HAVE_UTIL_H |
18 | # include <util.h> | 33 | # include <util.h> |
19 | #endif /* HAVE_UTIL_H */ | 34 | #endif |
35 | #include <unistd.h> | ||
20 | 36 | ||
21 | #include "sshpty.h" | 37 | #include "sshpty.h" |
22 | #include "log.h" | 38 | #include "log.h" |
23 | #include "misc.h" | 39 | #include "misc.h" |
24 | 40 | ||
25 | #include "selinux.h" | ||
26 | |||
27 | #ifdef HAVE_PTY_H | 41 | #ifdef HAVE_PTY_H |
28 | # include <pty.h> | 42 | # include <pty.h> |
29 | #endif | 43 | #endif |
@@ -40,7 +54,7 @@ RCSID("$OpenBSD: sshpty.c,v 1.12 2004/06/21 17:36:31 avsm Exp $"); | |||
40 | */ | 54 | */ |
41 | 55 | ||
42 | int | 56 | int |
43 | pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | 57 | pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen) |
44 | { | 58 | { |
45 | /* openpty(3) exists in OSF/1 and some other os'es */ | 59 | /* openpty(3) exists in OSF/1 and some other os'es */ |
46 | char *name; | 60 | char *name; |
@@ -163,11 +177,12 @@ pty_make_controlling_tty(int *ttyfd, const char *tty) | |||
163 | /* Changes the window size associated with the pty. */ | 177 | /* Changes the window size associated with the pty. */ |
164 | 178 | ||
165 | void | 179 | void |
166 | pty_change_window_size(int ptyfd, int row, int col, | 180 | pty_change_window_size(int ptyfd, u_int row, u_int col, |
167 | int xpixel, int ypixel) | 181 | u_int xpixel, u_int ypixel) |
168 | { | 182 | { |
169 | struct winsize w; | 183 | struct winsize w; |
170 | 184 | ||
185 | /* may truncate u_int -> u_short */ | ||
171 | w.ws_row = row; | 186 | w.ws_row = row; |
172 | w.ws_col = col; | 187 | w.ws_col = col; |
173 | w.ws_xpixel = xpixel; | 188 | w.ws_xpixel = xpixel; |
@@ -202,7 +217,9 @@ pty_setowner(struct passwd *pw, const char *tty) | |||
202 | fatal("stat(%.100s) failed: %.100s", tty, | 217 | fatal("stat(%.100s) failed: %.100s", tty, |
203 | strerror(errno)); | 218 | strerror(errno)); |
204 | 219 | ||
205 | setup_selinux_pty(pw->pw_name, tty); | 220 | #ifdef WITH_SELINUX |
221 | ssh_selinux_setup_pty(pw->pw_name, tty); | ||
222 | #endif | ||
206 | 223 | ||
207 | if (st.st_uid != pw->pw_uid || st.st_gid != gid) { | 224 | if (st.st_uid != pw->pw_uid || st.st_gid != gid) { |
208 | if (chown(tty, pw->pw_uid, gid) < 0) { | 225 | if (chown(tty, pw->pw_uid, gid) < 0) { |