aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.erl
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-04-21 13:20:38 +0000
committerErlang/OTP <[email protected]>2010-04-21 13:20:38 +0000
commit494341d4660ea9cf220848393e718b01fc7926e4 (patch)
treee22e1769837d4fc4a9a25f1c0ac4e7640c66f384 /lib/ssh/src/ssh.erl
parent91c89d54d45989a85367f10d5902b9b508754a49 (diff)
downloadotp-494341d4660ea9cf220848393e718b01fc7926e4.tar.gz
otp-494341d4660ea9cf220848393e718b01fc7926e4.tar.bz2
otp-494341d4660ea9cf220848393e718b01fc7926e4.zip
Changes after ssh-1.1.8
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 1e98e3d930..994c77436a 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, close/1, connection_info/2,
+-export([start/0, start/1, stop/0, connect/3, connect/4, 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) ->
- inet6;
-
+ inet;
inetopt(false) ->
- inet.
+ inet6.