summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-18 16:29:23 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-01-18 16:29:23 +0000
commitbf93114c09d3d255e833b8d5992997c66ac39940 (patch)
tree441fb0299f5d23685e3ee9ceca4c4b938562db82
parentf939c48e0018f21651a6956af78b806fa48c440f (diff)
downloadruby-bf93114c09d3d255e833b8d5992997c66ac39940.tar.gz
ruby-bf93114c09d3d255e833b8d5992997c66ac39940.tar.xz
ruby-bf93114c09d3d255e833b8d5992997c66ac39940.zip
* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
domain and search directive without an argument. reported by Sam Roberts. [ruby-talk:126781] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/resolv.rb2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 41d2c2f31..25c3a28a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 19 01:16:30 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
+ domain and search directive without an argument.
+ reported by Sam Roberts. [ruby-talk:126781]
+
Mon Jan 17 23:33:46 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (aix): fix typo. [ruby-talk:126401]
diff --git a/lib/resolv.rb b/lib/resolv.rb
index 069cf5c8f..84b0d0f10 100644
--- a/lib/resolv.rb
+++ b/lib/resolv.rb
@@ -734,8 +734,10 @@ class Resolv
when 'nameserver'
nameserver += args
when 'domain'
+ next if args.empty?
search = [args[0]]
when 'search'
+ next if args.empty?
search = args
end
}