# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1227419348 0
# Node ID 068a813b64543e117e073ec3b6797278be590024
# Parent  d07ae678819659a6e2051003763e3616bce25fd7# Parent  93b6587d9afbc82eea9dab23f8403e639bbe405b
Merge from waqas

diff -r d07ae6788196 -r 068a813b6454 core/modulemanager.lua
--- a/core/modulemanager.lua	Sun Nov 23 05:47:55 2008 +0000
+++ b/core/modulemanager.lua	Sun Nov 23 05:49:08 2008 +0000
@@ -92,8 +92,8 @@
 		if child then
 			local xmlns = child.attr.xmlns or xmlns;
 			log("debug", "Stanza of type %s from %s has xmlns: %s", name, origin_type, xmlns);
-			local handler = handlers[origin_type][name][xmlns];
-			if  handler then
+			local handler = handlers[origin_type][name] and handlers[origin_type][name][xmlns];
+			if handler then
 				log("debug", "Passing stanza to mod_%s", handler_info[handler].name);
 				return handler(origin, stanza) or true;
 			end
diff -r d07ae6788196 -r 068a813b6454 net/dns.lua
--- a/net/dns.lua	Sun Nov 23 05:47:55 2008 +0000
+++ b/net/dns.lua	Sun Nov 23 05:49:08 2008 +0000
@@ -502,11 +502,16 @@
 
 function resolver:adddefaultnameservers ()    -- - - - -  adddefaultnameservers
   local resolv_conf = io.open("/etc/resolv.conf");
-  if not resolv_conf then return nil; end
-  for line in resolv_conf:lines() do
-    local address = string.match (line, 'nameserver%s+(%d+%.%d+%.%d+%.%d+)')
-    if address then  self:addnameserver (address)  end
-    end  end
+  if resolv_conf then
+	  for line in resolv_conf:lines() do
+		local address = string.match (line, 'nameserver%s+(%d+%.%d+%.%d+%.%d+)')
+		if address then  self:addnameserver (address)  end
+	  end
+  else -- FIXME correct for windows, using opendns nameservers for now
+	self:addnameserver ("208.67.222.222")
+	self:addnameserver ("208.67.220.220")
+  end
+end
 
 
 function resolver:getsocket (servernum)    -- - - - - - - - - - - - - getsocket