aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh.erl
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-03-22 14:22:24 +0000
committerErlang/OTP <[email protected]>2010-03-22 14:22:24 +0000
commit835dba95f810cc925ac856171014b9dbea8c90be (patch)
tree9379ad0310e74f041a13a8742356c43a96085f2e /lib/ssh/src/ssh.erl
parent2fc7c367942b893beae1d572c6bcda78fe28c378 (diff)
downloadotp-835dba95f810cc925ac856171014b9dbea8c90be.tar.gz
otp-835dba95f810cc925ac856171014b9dbea8c90be.tar.bz2
otp-835dba95f810cc925ac856171014b9dbea8c90be.zip
Fix usage of ip_v6_disabled and publish it
Diffstat (limited to 'lib/ssh/src/ssh.erl')
-rw-r--r--lib/ssh/src/ssh.erl16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index f9a986a8b6..0eef3f95c0 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -1,19 +1,19 @@
%%
%% %CopyrightBegin%
-%%
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%%
+%%
+%% Copyright Ericsson AB 2004-2010. All Rights Reserved.
+%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
-%%
+%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
%% the License for the specific language governing rights and limitations
%% under the License.
-%%
+%%
%% %CopyrightEnd%
%%
@@ -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.