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-tun.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-tun.c')
-rw-r--r-- | openbsd-compat/port-tun.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index 31921615f..276474db8 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c | |||
@@ -16,9 +16,23 @@ | |||
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | #include <sys/types.h> | ||
20 | #include <sys/ioctl.h> | ||
21 | |||
22 | #include <netinet/in.h> | ||
23 | #include <arpa/inet.h> | ||
24 | #include <netinet/ip.h> | ||
25 | |||
26 | #include <errno.h> | ||
27 | #include <fcntl.h> | ||
28 | #include <stdarg.h> | ||
29 | #include <string.h> | ||
30 | #include <unistd.h> | ||
31 | |||
19 | #include "log.h" | 32 | #include "log.h" |
20 | #include "misc.h" | 33 | #include "misc.h" |
21 | #include "bufaux.h" | 34 | #include "buffer.h" |
35 | #include "channels.h" | ||
22 | 36 | ||
23 | /* | 37 | /* |
24 | * This is the portable version of the SSH tunnel forwarding, it | 38 | * This is the portable version of the SSH tunnel forwarding, it |
@@ -26,6 +40,7 @@ | |||
26 | * settings. | 40 | * settings. |
27 | * | 41 | * |
28 | * SSH_TUN_LINUX Use the (newer) Linux tun/tap device | 42 | * SSH_TUN_LINUX Use the (newer) Linux tun/tap device |
43 | * SSH_TUN_FREEBSD Use the FreeBSD tun/tap device | ||
29 | * SSH_TUN_COMPAT_AF Translate the OpenBSD address family | 44 | * SSH_TUN_COMPAT_AF Translate the OpenBSD address family |
30 | * SSH_TUN_PREPEND_AF Prepend/remove the address family | 45 | * SSH_TUN_PREPEND_AF Prepend/remove the address family |
31 | */ | 46 | */ |
@@ -93,7 +108,10 @@ sys_tun_open(int tun, int mode) | |||
93 | #ifdef SSH_TUN_FREEBSD | 108 | #ifdef SSH_TUN_FREEBSD |
94 | #include <sys/socket.h> | 109 | #include <sys/socket.h> |
95 | #include <net/if.h> | 110 | #include <net/if.h> |
111 | |||
112 | #ifdef HAVE_NET_IF_TUN_H | ||
96 | #include <net/if_tun.h> | 113 | #include <net/if_tun.h> |
114 | #endif | ||
97 | 115 | ||
98 | int | 116 | int |
99 | sys_tun_open(int tun, int mode) | 117 | sys_tun_open(int tun, int mode) |