summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-02 16:51:05 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-09-02 16:51:05 +0000
commit3a6c36e286c17a2a5f138a33511d9e6c3c7f655d (patch)
treee63c5b7f95a0677aa1ce5d0f0cabb0697bbb5c9f
parentf5d9078ad975cdc2993ec9566528b7eb82b1b23e (diff)
downloadruby-3a6c36e286c17a2a5f138a33511d9e6c3c7f655d.tar.gz
ruby-3a6c36e286c17a2a5f138a33511d9e6c3c7f655d.tar.xz
ruby-3a6c36e286c17a2a5f138a33511d9e6c3c7f655d.zip
examine whether '*' is included before IPAddr.new. [ruby-dev:29406]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/drb/acl.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c6bb0f41..e647aa3f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 3 01:45:17 2006 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
+
+ * lib/drb/acl.rb (ACLEntry#initialize): examine whether '*' is
+ included before IPAddr.new. [ruby-dev:29406]
+
Sat Sep 2 13:23:01 2006 Tanaka Akira <akr@fsij.org>
* common.mk (ia64.o): use the compiler driver to assemble ia64.s
diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
index aa86dbe70..861c8a514 100644
--- a/lib/drb/acl.rb
+++ b/lib/drb/acl.rb
@@ -13,6 +13,8 @@ class ACL
def initialize(str)
if str == '*' or str == 'all'
@pat = [:all]
+ elsif str.include?('*')
+ @pat = [:name, dot_pat(str)]
else
begin
@pat = [:ip, IPAddr.new(str)]