* Read in .resolv.conf before /etc/resolv.conf

svn: 1752

doc/UPDATES

@@ -2,6 +2,9 @@ This is a summary of ChangeLog basically.
 
 Lines prefixxed with '-' were disabled before release and are not finishsed.
 
+1.2.3
+* Read in '.resolv.conf' before '/etc/resolv.conf'
+
 1.2.2
 * Don't sanity check flags for users on DCC CHAT if they are on the bot via .botcmd.
 * help for cmd_unlink was missing [reason] parameter

src/adns.c

@@ -955,8 +955,8 @@ static void expire_queries()
 int egg_dns_init()
 {
 	_dns_header.flags = htons(1 << 8 | 1 << 7);
-	read_resolv("/etc/resolv.conf");
 	read_resolv(".resolv.conf");
+	read_resolv("/etc/resolv.conf");
 //	read_hosts("/etc/hosts");
 	read_hosts(".hosts");