aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-08-08 15:40:14 +0200
committerHenrik Nord <[email protected]>2011-08-08 15:40:18 +0200
commitb74afd6bcf54d3bc6a51da30a7551b3b2a0f402b (patch)
treea43c4b577f4203fbdf1b9805e5b8d5692d428a32 /lib/kernel
parent49f599b10882c7dc779d5b2bc06c4462f50209d1 (diff)
parent169080db01101a4db6b1c265d04d972f3c39488a (diff)
downloadotp-b74afd6bcf54d3bc6a51da30a7551b3b2a0f402b.tar.gz
otp-b74afd6bcf54d3bc6a51da30a7551b3b2a0f402b.tar.bz2
otp-b74afd6bcf54d3bc6a51da30a7551b3b2a0f402b.zip
Merge branch 'ms/inet-socket-domain-error' into dev
* ms/inet-socket-domain-error: inet: error if fd does not match socket domain OTP-9455
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/gen_udp_SUITE.erl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/kernel/test/gen_udp_SUITE.erl b/lib/kernel/test/gen_udp_SUITE.erl
index d8a5519195..b734d7fd98 100644
--- a/lib/kernel/test/gen_udp_SUITE.erl
+++ b/lib/kernel/test/gen_udp_SUITE.erl
@@ -400,6 +400,7 @@ open_fd(Config) when is_list(Config) ->
{ok,S1} = gen_udp:open(0),
{ok,P2} = inet:port(S1),
{ok,FD} = prim_inet:getfd(S1),
+ {error,einval} = gen_udp:open(P2, [inet6, {fd,FD}]),
{ok,S2} = gen_udp:open(P2, [{fd,FD}]),
{ok,S3} = gen_udp:open(0),
{ok,P3} = inet:port(S3),