From f07ca6b1c40fdeb2f37e6e425b0f667a1cae8cdb Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 22 Apr 2008 13:42:28 +0000 Subject: [PATCH] * lib/drb/drb.rb (DRb::DRbServer::check_insecure_method): should check method names by symbols, not by strings. a patch from Kazuhiro NISHIYAMA in [ruby-dev:34487]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/drb/drb.rb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77e954b66e..cba95ed878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 22 22:40:57 2008 Yukihiro Matsumoto + + * lib/drb/drb.rb (DRb::DRbServer::check_insecure_method): should + check method names by symbols, not by strings. a patch from + Kazuhiro NISHIYAMA in [ruby-dev:34487]. + Tue Apr 22 22:15:54 2008 Nobuyoshi Nakada * misc/ruby-style.el (ruby-style-{case,label}-indent): up list from diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 20e658e611..0e6212838e 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -1476,10 +1476,10 @@ module DRb raise(ArgumentError, "#{any_to_s(msg_id)} is not a symbol") unless Symbol == msg_id.class raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id) - if obj.private_methods.include?(msg_id.to_s) + if obj.private_methods.include?(msg_id) desc = any_to_s(obj) raise NoMethodError, "private method `#{msg_id}' called for #{desc}" - elsif obj.protected_methods.include?(msg_id.to_s) + elsif obj.protected_methods.include?(msg_id) desc = any_to_s(obj) raise NoMethodError, "protected method `#{msg_id}' called for #{desc}" else