diff options
| author | Niclas Eklund <[email protected]> | 2011-01-25 15:00:26 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-01-25 15:00:26 +0100 |
| commit | 14c9ff21544da8b5e195601ea21f9c954ee847da (patch) | |
| tree | 0d5e354eea398d99d99217726572e3e56eebe85b /lib/ssh/src/ssh_acceptor.erl | |
| parent | 2a49028427217bb7574274280524edee1e7f5d4d (diff) | |
| parent | f0168539740f650cb8a7ef0bf8b51facc40c1563 (diff) | |
| download | otp-14c9ff21544da8b5e195601ea21f9c954ee847da.tar.gz otp-14c9ff21544da8b5e195601ea21f9c954ee847da.tar.bz2 otp-14c9ff21544da8b5e195601ea21f9c954ee847da.zip | |
Merge branch 'maint-r14' into dev
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 -> |