aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.erl
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-04-21 10:42:46 +0000
committerErlang/OTP <[email protected]>2010-04-21 10:42:46 +0000
commit08225797f7ef943d0c82a1d9dd6650d94ca2580d (patch)
tree804db67dba672566fe108116c5f7aba8539d1339 /lib/ssh/src/ssh.erl
parent8d1088d461c46211ff91eb21e9470e85f4bdc29c (diff)
downloadotp-08225797f7ef943d0c82a1d9dd6650d94ca2580d.tar.gz
otp-08225797f7ef943d0c82a1d9dd6650d94ca2580d.tar.bz2
otp-08225797f7ef943d0c82a1d9dd6650d94ca2580d.zip
New branch for ssh-2.0 and later
Diffstat (limited to 'lib/ssh/src/ssh.erl')
-rw-r--r--lib/ssh/src/ssh.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 994c77436a..1e98e3d930 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -24,7 +24,7 @@
-include("ssh.hrl").
-include("ssh_connect.hrl").
--export([start/0, start/1, stop/0, connect/3, connect/4, close/1, connection_info/2,
+-export([start/0, start/1, stop/0, connect/3, close/1, connection_info/2,
channel_info/3,
daemon/1, daemon/2, daemon/3,
stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2,
@@ -330,10 +330,10 @@ handle_options([{nodelay, _} = Opt | Rest], SockOpts, Opts) ->
handle_options([Opt | Rest], SockOpts, Opts) ->
handle_options(Rest, SockOpts, [Opt | Opts]).
-%% Has IPv6 been disabled?
inetopt(true) ->
- inet;
+ inet6;
+
inetopt(false) ->
- inet6.
+ inet.