diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-11-12 10:29:51 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-11-12 10:29:51 +0100 |
| commit | 674c8440d536d5fb2e96ececeee78cb1e2701e52 (patch) | |
| tree | 22d635d06e679a97b8a6c8a4246b9e78c2c3058c /lib/ssh/src/ssh.appup.src | |
| parent | 668c4263148fdb346ad2d9cd9fcede7e0c9dad6a (diff) | |
| parent | f35c7ad2ec46cdcaeef935f4da459865e03cb5f9 (diff) | |
| download | otp-674c8440d536d5fb2e96ececeee78cb1e2701e52.tar.gz otp-674c8440d536d5fb2e96ececeee78cb1e2701e52.tar.bz2 otp-674c8440d536d5fb2e96ececeee78cb1e2701e52.zip | |
Merge branch 'fredrik/ssh-password-conf/OTP-10511' into maint
* fredrik/ssh-password-conf/OTP-10511:
Ssh appup modifications
Updated appup for ssh
Bumped revision
Removed some testing variables
ssh_opts is now a proper list
After auth rsa and dsa passwords is set to undefined
Removing the password after auth
Diffstat (limited to 'lib/ssh/src/ssh.appup.src')
| -rw-r--r-- | lib/ssh/src/ssh.appup.src | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src index d08dbafc32..8914aeffdb 100644 --- a/lib/ssh/src/ssh.appup.src +++ b/lib/ssh/src/ssh.appup.src @@ -19,10 +19,15 @@ {"%VSN%", [ + {<<"2.1.1">>, [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, + {load_module, ssh_auth, soft_purge, soft_purge, []}, + {load_module, ssh, soft_purge, soft_purge, []}]}, {<<"2.1">>, [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, {load_module, ssh_connection, soft_purge, soft_purge, []}, {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, {load_module, ssh_auth, soft_purge, soft_purge, []}, + {load_module, ssh_connection_handler, 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, []}]}, @@ -30,14 +35,19 @@ {<<"1\\.*">>, [{restart_application, ssh}]} ], [ + {<<"2.1.1">>, [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}, + {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, + {load_module, ssh_auth, soft_purge, soft_purge, []}, + {load_module, ssh, soft_purge, soft_purge, []}]}, {<<"2.1">>,[{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []}, {load_module, ssh_connection, soft_purge, soft_purge, []}, {load_module, ssh_connection_manager, soft_purge, soft_purge, []}, {load_module, ssh_auth, soft_purge, soft_purge, []}, + {load_module, ssh_connection_handler, 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}]} ] -}. +}.
\ No newline at end of file |