diff options
author | Ingela Anderton Andin <[email protected]> | 2012-02-13 10:30:13 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2012-02-13 10:30:13 +0100 |
commit | e0222e33523e9d01d1ec82d88560c30375a255cd (patch) | |
tree | 2d184ca752918cead43972aa6d6377de6f59b70c /lib/ssh/src/sshd_sup.erl | |
parent | ba4d72d0462c3e5df038c36b5194e5b8c9eacf92 (diff) | |
parent | 86231a380b27fc262e48aa8c3f0372d4d2056682 (diff) | |
download | otp-e0222e33523e9d01d1ec82d88560c30375a255cd.tar.gz otp-e0222e33523e9d01d1ec82d88560c30375a255cd.tar.bz2 otp-e0222e33523e9d01d1ec82d88560c30375a255cd.zip |
Merge branch 'maint'
* maint:
Correct access flag handling in sftpd
Client fallbacks to ipv4 if connection is refused with ipv6
Cleaned up code so that ssh_file can become a template for a documented ssh_keys behavior
Test case maintenance
Better handling of IPv6
Ssh daemon handles RSA host keys
Removed no longer needed code
Use the public_key application for all public key handling
Diffstat (limited to 'lib/ssh/src/sshd_sup.erl')
0 files changed, 0 insertions, 0 deletions