Jelajahi Sumber

Merge branch 'read-etc-hosts' into maint

* read-etc-hosts:
  Read in /etc/hosts before .hosts
Bryan Drewery 13 tahun lalu
induk
melakukan
11ec7c9a83
2 mengubah file dengan 4 tambahan dan 1 penghapusan
  1. 3 0
      doc/UPDATES
  2. 1 1
      src/adns.c

+ 3 - 0
doc/UPDATES

@@ -1,3 +1,6 @@
+maint
+  * Read in /etc/hosts on startup
+
 1.4.3
 1.4.3
   * Default 'set promisc' to ignore since it's usually a false positive
   * Default 'set promisc' to ignore since it's usually a false positive
     and doesn't matter much.
     and doesn't matter much.

+ 1 - 1
src/adns.c

@@ -1338,7 +1338,7 @@ int egg_dns_init()
 		add_dns_server("8.8.4.4");
 		add_dns_server("8.8.4.4");
         }
         }
 
 
-//	read_hosts("/etc/hosts");
+	read_hosts("/etc/hosts");
 	read_hosts(".hosts");
 	read_hosts(".hosts");
     
     
 /* root servers for future development (tracing down)
 /* root servers for future development (tracing down)