diff options
| author | Lars Thorsen <[email protected]> | 2018-03-05 12:41:34 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2018-03-05 12:41:34 +0100 |
| commit | 7ac3e7857f49b231ada6517e6a2c92f302d54e0c (patch) | |
| tree | 7cec54f28594ddd0130def1c76f838a6dae060a9 /lib/ssh/src | |
| parent | 7c38b79502f9ca16a20a1269bb95a5b7ca1f0adb (diff) | |
| parent | 45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04 (diff) | |
| download | otp-7ac3e7857f49b231ada6517e6a2c92f302d54e0c.tar.gz otp-7ac3e7857f49b231ada6517e6a2c92f302d54e0c.tar.bz2 otp-7ac3e7857f49b231ada6517e6a2c92f302d54e0c.zip | |
Merge branch 'maint' of github.com:erlang/otp into maint
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh.erl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 032d87bdad..25d537c624 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -184,7 +184,6 @@ channel_info(ConnectionRef, ChannelId, Options) -> daemon(Port) -> daemon(Port, []). - daemon(Socket, UserOptions) when is_port(Socket) -> try #{} = Options = ssh_options:handle_options(server, UserOptions), @@ -267,8 +266,6 @@ daemon(Host0, Port0, UserOptions0) when 0 =< Port0, Port0 =< 65535, daemon(_, _, _) -> {error, badarg}. - - %%-------------------------------------------------------------------- -spec daemon_info(daemon_ref()) -> ok_error( [{atom(), term()}] ). |