diff options
| author | Erlang/OTP <[email protected]> | 2011-01-24 08:42:57 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-01-24 08:42:57 +0100 |
| commit | a261e2982b7cd5d0101c8c04b76c10c8dad64dd3 (patch) | |
| tree | 3ab7293dd146a7a3cb3b9efd24a271a3c5eeefc2 /lib/ssh/src/ssh_acceptor.erl | |
| parent | 6deca2a989772f261b59f11da031832f1ea9c45d (diff) | |
| parent | c921fa494f7af964fb20aa344fbeefaf8f06d48e (diff) | |
| download | otp-a261e2982b7cd5d0101c8c04b76c10c8dad64dd3.tar.gz otp-a261e2982b7cd5d0101c8c04b76c10c8dad64dd3.tar.bz2 otp-a261e2982b7cd5d0101c8c04b76c10c8dad64dd3.zip | |
Merge branch 'nick/ssh/inet6_enetunreach/OTP-9031' into maint-r14
* nick/ssh/inet6_enetunreach/OTP-9031:
Updated notes file.
Added updated modules to the appup file.
OTP-9031 - SSH did not handle the error reason enetunreach when trying to open a IPv6 connection.
Diffstat (limited to 'lib/ssh/src/ssh_acceptor.erl')
| -rw-r--r-- | lib/ssh/src/ssh_acceptor.erl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl index 9060626ab3..59fbd24cf5 100644 --- a/lib/ssh/src/ssh_acceptor.erl +++ b/lib/ssh/src/ssh_acceptor.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% Copyright Ericsson AB 2008-2011. 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 @@ -55,6 +55,10 @@ acceptor_init(Parent, Port, Address, SockOpts, Opts, AcceptTimeout) -> do_socket_listen(Callback, Port, Opts) -> case Callback:listen(Port, Opts) of + {error, nxdomain} -> + Callback:listen(Port, lists:delete(inet6, Opts)); + {error, enetunreach} -> + Callback:listen(Port, lists:delete(inet6, Opts)); {error, eafnosupport} -> Callback:listen(Port, lists:delete(inet6, Opts)); Other -> |