# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1335663849 -3600
# Node ID 1537bf7f96180c13e487a0c62257006482fd5dad
# Parent  e239668aa6d22404b81957c76d500d72b2a54443# Parent  e8bd0a6f45e2788aaf8fdb73ee4c3470cf3499db
Merge with Zash

diff -r e8bd0a6f45e2 -r 1537bf7f9618 net/connlisteners.lua
diff -r e8bd0a6f45e2 -r 1537bf7f9618 net/httpserver.lua
diff -r e8bd0a6f45e2 -r 1537bf7f9618 plugins/mod_posix.lua
--- a/plugins/mod_posix.lua	Sun Apr 29 02:24:00 2012 +0200
+++ b/plugins/mod_posix.lua	Sun Apr 29 02:44:09 2012 +0100
@@ -112,7 +112,7 @@
 local syslog_opened;
 function syslog_sink_maker(config)
 	if not syslog_opened then
-		pposix.syslog_open("prosody");
+		pposix.syslog_open("prosody", module:get_option_string("syslog_facility"));
 		syslog_opened = true;
 	end
 	local syslog, format = pposix.syslog_log, string.format;
diff -r e8bd0a6f45e2 -r 1537bf7f9618 plugins/mod_pubsub.lua
--- a/plugins/mod_pubsub.lua	Sun Apr 29 02:24:00 2012 +0200
+++ b/plugins/mod_pubsub.lua	Sun Apr 29 02:44:09 2012 +0100
@@ -57,6 +57,7 @@
 	for _, entry in pairs(results) do
 		data:add_child(entry);
 	end
+	local reply;
 	if data then
 		reply = st.reply(stanza)
 			:tag("pubsub", { xmlns = xmlns_pubsub })
diff -r e8bd0a6f45e2 -r 1537bf7f9618 plugins/mod_version.lua
--- a/plugins/mod_version.lua	Sun Apr 29 02:24:00 2012 +0200
+++ b/plugins/mod_version.lua	Sun Apr 29 02:44:09 2012 +0100
@@ -21,7 +21,7 @@
 		version = "Windows";
 	else
 		local os_version_command = module:get_option("os_version_command");
-		local ok pposix = pcall(require, "pposix");
+		local ok, pposix = pcall(require, "util.pposix");
 		if not os_version_command and (ok and pposix and pposix.uname) then
 			version = pposix.uname().sysname;
 		end