diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:33:52 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-08-30 09:33:52 +0200 |
| commit | 94f6c68ff4a46c69be0030aff553d6db92f29a35 (patch) | |
| tree | 690aab5afb85bb98968a4349c0e38d4eaa5e8535 /lib/ssh/src/ssh.appup.src | |
| parent | fcbb937b9e34e97529aa28e994c05c2d03dc89cd (diff) | |
| parent | 1429ac4b0a76c73224382a32ecd28ee89f5327ce (diff) | |
| download | otp-94f6c68ff4a46c69be0030aff553d6db92f29a35.tar.gz otp-94f6c68ff4a46c69be0030aff553d6db92f29a35.tar.bz2 otp-94f6c68ff4a46c69be0030aff553d6db92f29a35.zip | |
Merge branch 'ia/ssh/ignore-incorrect-lines-in-auth_keys-and-known_hosts' into maint
* ia/ssh/ignore-incorrect-lines-in-auth_keys-and-known_hosts:
ssh: Increase robustness
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index 6967a0f464..d08dbafc32 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -24,6 +24,7 @@ {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, {load_module, ssh_auth, soft_purge, soft_purge, []}, {load_module, ssh_channel, soft_purge, soft_purge, []}, + {load_module, ssh_file, soft_purge, soft_purge, []}]}, {load_module, ssh, soft_purge, soft_purge, []}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} @@ -34,6 +35,7 @@ {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, {load_module, ssh_auth, soft_purge, soft_purge, []}, {load_module, ssh_channel, soft_purge, soft_purge, []}, + {load_module, ssh_file, soft_purge, soft_purge, []}]}, {load_module, ssh, soft_purge, soft_purge, []}]}, {<<"2.0\\.*">>, [{restart_application, ssh}]}, {<<"1\\.*">>, [{restart_application, ssh}]} |