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/port-aix.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 'openbsd-compat/port-aix.c')
-rw-r--r-- | openbsd-compat/port-aix.c | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index 81d8124e0..b9fabf61f 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -25,16 +25,36 @@ | |||
25 | * | 25 | * |
26 | */ | 26 | */ |
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | |||
29 | #include "xmalloc.h" | ||
30 | #include "buffer.h" | ||
31 | #include "key.h" | ||
32 | #include "hostfile.h" | ||
28 | #include "auth.h" | 33 | #include "auth.h" |
29 | #include "ssh.h" | 34 | #include "ssh.h" |
30 | #include "log.h" | 35 | #include "log.h" |
31 | #include "xmalloc.h" | ||
32 | #include "buffer.h" | ||
33 | 36 | ||
34 | #ifdef _AIX | 37 | #ifdef _AIX |
35 | 38 | ||
39 | #include <errno.h> | ||
40 | #if defined(HAVE_NETDB_H) | ||
41 | # include <netdb.h> | ||
42 | #endif | ||
36 | #include <uinfo.h> | 43 | #include <uinfo.h> |
44 | #include <stdarg.h> | ||
45 | #include <string.h> | ||
46 | #include <unistd.h> | ||
37 | #include <sys/socket.h> | 47 | #include <sys/socket.h> |
48 | |||
49 | #ifdef WITH_AIXAUTHENTICATE | ||
50 | # include <login.h> | ||
51 | # include <userpw.h> | ||
52 | # if defined(HAVE_SYS_AUDIT_H) && defined(AIX_LOGINFAILED_4ARG) | ||
53 | # include <sys/audit.h> | ||
54 | # endif | ||
55 | # include <usersec.h> | ||
56 | #endif | ||
57 | |||
38 | #include "port-aix.h" | 58 | #include "port-aix.h" |
39 | 59 | ||
40 | # ifdef HAVE_SETAUTHDB | 60 | # ifdef HAVE_SETAUTHDB |
@@ -256,15 +276,17 @@ sys_auth_record_login(const char *user, const char *host, const char *ttynm, | |||
256 | Buffer *loginmsg) | 276 | Buffer *loginmsg) |
257 | { | 277 | { |
258 | char *msg = NULL; | 278 | char *msg = NULL; |
279 | static int msg_done = 0; | ||
259 | int success = 0; | 280 | int success = 0; |
260 | 281 | ||
261 | aix_setauthdb(user); | 282 | aix_setauthdb(user); |
262 | if (loginsuccess((char *)user, (char *)host, (char *)ttynm, &msg) == 0) { | 283 | if (loginsuccess((char *)user, (char *)host, (char *)ttynm, &msg) == 0) { |
263 | success = 1; | 284 | success = 1; |
264 | if (msg != NULL) { | 285 | if (msg != NULL && loginmsg != NULL && !msg_done) { |
265 | debug("AIX/loginsuccess: msg %s", msg); | 286 | debug("AIX/loginsuccess: msg %s", msg); |
266 | buffer_append(loginmsg, msg, strlen(msg)); | 287 | buffer_append(loginmsg, msg, strlen(msg)); |
267 | xfree(msg); | 288 | xfree(msg); |
289 | msg_done = 1; | ||
268 | } | 290 | } |
269 | } | 291 | } |
270 | aix_restoreauthdb(); | 292 | aix_restoreauthdb(); |