summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 13:42:28 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 13:42:28 +0000
commitf07ca6b1c40fdeb2f37e6e425b0f667a1cae8cdb (patch)
tree1b85d05e4b1b215509077fc27031e7f668a323d3
parentf80616b6d25865e9e6f84fd06e5a6d2e40d09437 (diff)
* lib/drb/drb.rb (DRb::DRbServer::check_insecure_method): should
check method names by symbols, not by strings. a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com> in [ruby-dev:34487]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/drb/drb.rb4
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 <matz@ruby-lang.org>
+
+ * lib/drb/drb.rb (DRb::DRbServer::check_insecure_method): should
+ check method names by symbols, not by strings. a patch from
+ Kazuhiro NISHIYAMA <zn at mbf.nifty.com> in [ruby-dev:34487].
+
Tue Apr 22 22:15:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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