From e288cff1720408b48ee30274f325f481d4900389 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 27 Feb 2009 14:23:54 +0000
Subject: * ext/socket/ancdata.c (bsock_recvmsg_internal): close FDs passed by 
  SCM_RIGHTS unless :scm_rights=>true is given.   (discard_cmsg): extracted
 from rsock_discard_cmsg_resource.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/socket/test_unix.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb
index 1e9073dd0..e75d7b6f9 100644
--- a/test/socket/test_unix.rb
+++ b/test/socket/test_unix.rb
@@ -48,7 +48,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
           return
         end
         assert_equal(1, ret)
-        ret = s2.recvmsg
+        ret = s2.recvmsg(:scm_rights=>true)
         data, srcaddr, flags, *ctls = ret
         recv_io_ary = []
         ctls.each {|ctl|
@@ -83,7 +83,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
           return
         end
         assert_equal(1, ret)
-        ret = s2.recvmsg
+        ret = s2.recvmsg(:scm_rights=>true)
         data, srcaddr, flags, *ctls = ret
         recv_io_ary = []
         ctls.each {|ctl|
@@ -170,7 +170,7 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
     IO.pipe {|r1, w|
       UNIXSocket.pair {|s1, s2|
         s1.send_io(r1)
-        ret = s2.recvmsg
+        ret = s2.recvmsg(:scm_rights=>true)
         data, srcaddr, flags, *ctls = ret
         assert_equal("\0", data)
 	if flags == nil
-- 
cgit