diff options
author | Fredrik Gustafsson <[email protected]> | 2012-11-22 09:48:39 +0100 |
---|---|---|
committer | Fredrik Gustafsson <[email protected]> | 2012-11-22 09:48:39 +0100 |
commit | bc7cf293a513bb571831e16ac95827144051a783 (patch) | |
tree | 5036798f96258cd6bcafc70d9df0b0815468f097 /lib/ssh/src | |
parent | aac2d702d0490e402723bc73e142a6df59bf3172 (diff) | |
parent | a74eb653718e63693da057c2761b308dbd8f353f (diff) | |
download | otp-bc7cf293a513bb571831e16ac95827144051a783.tar.gz otp-bc7cf293a513bb571831e16ac95827144051a783.tar.bz2 otp-bc7cf293a513bb571831e16ac95827144051a783.zip |
Merge branch 'fredrik/ssh/fix-dialyzer-warn-r15b03' into maint
* fredrik/ssh/fix-dialyzer-warn-r15b03:
is_boolean/1 is called instead of checking
Removed ip options to gen_tcp from ssh.erl
Diffstat (limited to 'lib/ssh/src')
-rw-r--r-- | lib/ssh/src/ssh.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl index 7d68b1d7bd..e5c016eb3f 100644 --- a/lib/ssh/src/ssh.erl +++ b/lib/ssh/src/ssh.erl @@ -411,8 +411,7 @@ handle_ssh_option({disconnectfun , Value} = Opt) when is_function(Value) -> Opt; handle_ssh_option({failfun, Value} = Opt) when is_function(Value) -> Opt; -handle_ssh_option({ip_v6_disabled, Value} = Opt) when Value == true; - Value == false -> +handle_ssh_option({ip_v6_disabled, Value} = Opt) when is_boolean(Value) -> Opt; handle_ssh_option({transport, {Protocol, Cb, ClosTag}} = Opt) when is_atom(Protocol), is_atom(Cb), @@ -463,7 +462,7 @@ check_pref_algs([H|T]) -> inetopt(true) -> inet; inetopt(false) -> - case gen_tcp:listen(0, [inet6, {ip, loopback}]) of + case gen_tcp:listen(0, [inet6]) of {ok, Dummyport} -> gen_tcp:close(Dummyport), inet6; |