File tree Expand file tree Collapse file tree 1 file changed +13
-13
lines changed Expand file tree Collapse file tree 1 file changed +13
-13
lines changed Original file line number Diff line number Diff line change @@ -998,13 +998,13 @@ def Config.parse_resolv_conf(filename)
998
998
next unless keyword
999
999
case keyword
1000
1000
when 'nameserver'
1001
- nameserver . concat ( args )
1001
+ nameserver . concat ( args . each ( & :freeze ) )
1002
1002
when 'domain'
1003
1003
next if args . empty?
1004
- search = [ args [ 0 ] ]
1004
+ search = [ args [ 0 ] . freeze ]
1005
1005
when 'search'
1006
1006
next if args . empty?
1007
- search = args
1007
+ search = args . each ( & :freeze )
1008
1008
when 'options'
1009
1009
args . each { |arg |
1010
1010
case arg
@@ -1015,22 +1015,22 @@ def Config.parse_resolv_conf(filename)
1015
1015
end
1016
1016
}
1017
1017
}
1018
- return { :nameserver => nameserver , :search => search , :ndots => ndots }
1018
+ return { :nameserver => nameserver . freeze , :search => search . freeze , :ndots => ndots . freeze } . freeze
1019
1019
end
1020
1020
1021
1021
def Config . default_config_hash ( filename = "/etc/resolv.conf" )
1022
1022
if File . exist? filename
1023
- config_hash = Config . parse_resolv_conf ( filename )
1023
+ Config . parse_resolv_conf ( filename )
1024
+ elsif WINDOWS
1025
+ require 'win32/resolv' unless defined? ( Win32 ::Resolv )
1026
+ search , nameserver = Win32 ::Resolv . get_resolv_info
1027
+ config_hash = { }
1028
+ config_hash [ :nameserver ] = nameserver if nameserver
1029
+ config_hash [ :search ] = [ search ] . flatten if search
1030
+ config_hash
1024
1031
else
1025
- if WINDOWS
1026
- require 'win32/resolv' unless defined? ( Win32 ::Resolv )
1027
- search , nameserver = Win32 ::Resolv . get_resolv_info
1028
- config_hash = { }
1029
- config_hash [ :nameserver ] = nameserver if nameserver
1030
- config_hash [ :search ] = [ search ] . flatten if search
1031
- end
1032
+ { }
1032
1033
end
1033
- config_hash || { }
1034
1034
end
1035
1035
1036
1036
def lazy_initialize
You can’t perform that action at this time.
0 commit comments