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 /openbsd-compat/openbsd-compat.h | |
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 'openbsd-compat/openbsd-compat.h')
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 1a3027353..aac2e6cbc 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.33 2005/12/31 05:33:37 djm Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.42 2006/09/03 12:44:50 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -31,6 +31,11 @@ | |||
31 | 31 | ||
32 | #include "includes.h" | 32 | #include "includes.h" |
33 | 33 | ||
34 | #include <sys/types.h> | ||
35 | #include <pwd.h> | ||
36 | |||
37 | #include <sys/socket.h> | ||
38 | |||
34 | /* OpenBSD function replacements */ | 39 | /* OpenBSD function replacements */ |
35 | #include "base64.h" | 40 | #include "base64.h" |
36 | #include "sigact.h" | 41 | #include "sigact.h" |
@@ -38,7 +43,7 @@ | |||
38 | #include "readpassphrase.h" | 43 | #include "readpassphrase.h" |
39 | #include "vis.h" | 44 | #include "vis.h" |
40 | #include "getrrsetbyname.h" | 45 | #include "getrrsetbyname.h" |
41 | 46 | #include "sha2.h" | |
42 | 47 | ||
43 | #ifndef HAVE_BASENAME | 48 | #ifndef HAVE_BASENAME |
44 | char *basename(const char *path); | 49 | char *basename(const char *path); |
@@ -126,13 +131,16 @@ int getgrouplist(const char *, gid_t, gid_t *, int *); | |||
126 | int BSDgetopt(int argc, char * const *argv, const char *opts); | 131 | int BSDgetopt(int argc, char * const *argv, const char *opts); |
127 | #endif | 132 | #endif |
128 | 133 | ||
134 | #if defined(HAVE_DECL_WRITEV) && HAVE_DECL_WRITEV == 0 | ||
135 | # include <sys/types.h> | ||
136 | # include <sys/uio.h> | ||
137 | int writev(int, struct iovec *, int); | ||
138 | #endif | ||
129 | 139 | ||
130 | /* Home grown routines */ | 140 | /* Home grown routines */ |
131 | #include "bsd-misc.h" | 141 | #include "bsd-misc.h" |
132 | #include "bsd-waitpid.h" | 142 | #include "bsd-waitpid.h" |
133 | 143 | ||
134 | /*#include <sys/types.h> XXX Still needed? * For uid_t, gid_t * */ | ||
135 | |||
136 | #ifndef HAVE_GETPEEREID | 144 | #ifndef HAVE_GETPEEREID |
137 | int getpeereid(int , uid_t *, gid_t *); | 145 | int getpeereid(int , uid_t *, gid_t *); |
138 | #endif | 146 | #endif |
@@ -147,13 +155,14 @@ int asprintf(char **, const char *, ...); | |||
147 | #endif | 155 | #endif |
148 | 156 | ||
149 | #ifndef HAVE_OPENPTY | 157 | #ifndef HAVE_OPENPTY |
158 | # include <sys/ioctl.h> /* for struct winsize */ | ||
150 | int openpty(int *, int *, char *, struct termios *, struct winsize *); | 159 | int openpty(int *, int *, char *, struct termios *, struct winsize *); |
151 | #endif /* HAVE_OPENPTY */ | 160 | #endif /* HAVE_OPENPTY */ |
152 | 161 | ||
153 | /* #include <sys/types.h> XXX needed? For size_t */ | 162 | /* #include <sys/types.h> XXX needed? For size_t */ |
154 | 163 | ||
155 | #ifndef HAVE_SNPRINTF | 164 | #ifndef HAVE_SNPRINTF |
156 | int snprintf(char *, size_t, const char *, ...); | 165 | int snprintf(char *, size_t, SNPRINTF_CONST char *, ...); |
157 | #endif | 166 | #endif |
158 | 167 | ||
159 | #ifndef HAVE_STRTOLL | 168 | #ifndef HAVE_STRTOLL |
@@ -164,6 +173,10 @@ long long strtoll(const char *, char **, int); | |||
164 | long long strtonum(const char *, long long, long long, const char **); | 173 | long long strtonum(const char *, long long, long long, const char **); |
165 | #endif | 174 | #endif |
166 | 175 | ||
176 | #if !defined(HAVE_VASPRINTF) || !defined(HAVE_VSNPRINTF) | ||
177 | # include <stdarg.h> | ||
178 | #endif | ||
179 | |||
167 | #ifndef HAVE_VASPRINTF | 180 | #ifndef HAVE_VASPRINTF |
168 | int vasprintf(char **, const char *, va_list); | 181 | int vasprintf(char **, const char *, va_list); |
169 | #endif | 182 | #endif |
@@ -176,16 +189,18 @@ void *xmmap(size_t size); | |||
176 | char *xcrypt(const char *password, const char *salt); | 189 | char *xcrypt(const char *password, const char *salt); |
177 | char *shadow_pw(struct passwd *pw); | 190 | char *shadow_pw(struct passwd *pw); |
178 | 191 | ||
179 | |||
180 | /* rfc2553 socket API replacements */ | 192 | /* rfc2553 socket API replacements */ |
181 | #include "fake-rfc2553.h" | 193 | #include "fake-rfc2553.h" |
182 | 194 | ||
183 | /* Routines for a single OS platform */ | 195 | /* Routines for a single OS platform */ |
184 | #include "bsd-cray.h" | 196 | #include "bsd-cray.h" |
185 | #include "bsd-cygwin_util.h" | 197 | #include "bsd-cygwin_util.h" |
186 | #include "port-irix.h" | 198 | |
187 | #include "port-aix.h" | 199 | #include "port-aix.h" |
188 | #include "port-uw.h" | 200 | #include "port-irix.h" |
201 | #include "port-linux.h" | ||
202 | #include "port-solaris.h" | ||
189 | #include "port-tun.h" | 203 | #include "port-tun.h" |
204 | #include "port-uw.h" | ||
190 | 205 | ||
191 | #endif /* _OPENBSD_COMPAT_H */ | 206 | #endif /* _OPENBSD_COMPAT_H */ |