From 878eb97a81c336858873630e398bd25b31ac29c8 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 Jan 2004 16:47:23 +0000
Subject: * parse.y (newline_node): do not use NODE_NEWLINE node anymore,   use
 NEWLINE flag instead.

* ext/socket/socket.c (sock_gethostbyname): returns host if
  ai_canonname is NULL. (ruby-bugs PR#1243)

* parse.y (block_append): update nd_end for "real" head node.
  [ruby-list:39058]

* marshal.c (w_class): should not dump singleton class.
  [ruby-dev:22631]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/find.rb       | 3 ++-
 lib/net/telnet.rb | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/find.rb b/lib/find.rb
index 9ca39cabc..e94d5c2c7 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -36,7 +36,8 @@ module Find
     paths.collect!{|d| d.dup}
     while file = paths.shift
       catch(:prune) do
-	yield file
+	yield file.dup
+        file.untaint
 	begin
 	  if File.lstat(file).directory? then
 	    d = Dir.open(file)
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 095be4533..6e50d1757 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -706,7 +706,7 @@ module Net # :nodoc:
       end
 
       if block_given?
-        line = waitfor(/login[: ]*\z/n){|c| yield c }
+        line = waitfor(/[Ll]ogin[: ]*\z/n){|c| yield c }
         if password
           line += cmd({"String" => username,
                        "Match" => /Password[: ]*\z/n}){|c| yield c }
@@ -715,7 +715,7 @@ module Net # :nodoc:
           line += cmd(username){|c| yield c }
         end
       else
-        line = waitfor(/login[: ]*\z/n)
+        line = waitfor(/[Ll]ogin[: ]*\z/n)
         if password
           line += cmd({"String" => username,
                        "Match" => /Password[: ]*\z/n})
-- 
cgit