prosody
0862416befe3%3A29f165027f07

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

499:29f165027f07

Merge from waqas
author Matthew Wild <mwild1@gmail.com>
date Sun, 30 Nov 2008 01:02:12 +0000
parents 497:a2ccfabfda82 (diff) 498:0862416befe3 (current diff)
children 500:6468ea154296
files
diffstat 3 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Nov 30 06:01:37 2008 +0500
+++ b/Makefile	Sun Nov 30 01:02:12 2008 +0000
@@ -14,7 +14,7 @@
 all:
 	$(MAKE) all -C util-src
 
-install: prosody.install prosody.cfg.lua util/encodings.so util/encodings.so
+install: prosody.install prosody.cfg.lua.install util/encodings.so util/encodings.so
 	install -d $(BIN) $(CONFIG) $(MODULES) $(SOURCE)
 	install -d $(CONFIG)/certs
 	install -d $(SOURCE)/core $(SOURCE)/net $(SOURCE)/util
@@ -25,12 +25,12 @@
 	install -m644 plugins/* $(MODULES)
 	install -m644 certs/* $(CONFIG)/certs
 	install -m644 plugins/* $(MODULES)
-	install -m644 prosody.cfg.lua $(CONFIG)/prosody.cfg.lua
+	install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
 	$(MAKE) install -C util-src
 
 clean:
 	rm -f prosody.install
-	rm -f prosody.cfg.lua
+	rm -f prosody.cfg.lua.install
 	$(MAKE) clean -C util-src
 
 util/encodings.so:
@@ -42,6 +42,6 @@
 prosody.install: prosody
 	sed "s|^CFG_SOURCEDIR=.*;$$|CFG_SOURCEDIR='$(INSTALLEDSOURCE)';|;s|^CFG_CONFIGDIR=.*;$$|CFG_CONFIGDIR='$(INSTALLEDCONFIG)';|;s|^CFG_PLUGINDIR=.*;$$|CFG_PLUGINDIR='$(INSTALLEDMODULES)/';|;" prosody > prosody.install
 
-prosody.cfg.lua:
-	sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua
+prosody.cfg.lua.install:
+	sed 's|certs/|$(INSTALLEDCONFIG)/certs/|' prosody.cfg.lua.dist > prosody.cfg.lua.install
 
--- a/util-src/Makefile	Sun Nov 30 06:01:37 2008 +0500
+++ b/util-src/Makefile	Sun Nov 30 01:02:12 2008 +0000
@@ -21,8 +21,8 @@
 	rm -f ../util/*.so
 
 encodings.so: encodings.c
-	gcc -shared encodings.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(IDN_LIB) -o encodings.so
+	gcc -shared -fPIC encodings.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(IDN_LIB) -o encodings.so
 
 hashes.so: hashes.c
-	gcc -shared hashes.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so
+	gcc -shared -fPIC hashes.c -I$(LUA_INCDIR) -l$(LUA_LIB) -l$(OPENSSL_LIB) -o hashes.so
 	
--- a/util/sasl.lua	Sun Nov 30 06:01:37 2008 +0500
+++ b/util/sasl.lua	Sun Nov 30 01:02:12 2008 +0000
@@ -12,6 +12,7 @@
 local error = error
 local print = print
 local idna_ascii = require "util.encodings".idna.to_ascii
+local idna_unicode = require "util.encodings".idna.to_unicode
 
 module "sasl"
 
@@ -87,7 +88,7 @@
 											qop = "auth",
 											charset = "utf-8",
 											algorithm = "md5-sess",
-											realm = self.realm});
+											realm = idna_ascii(self.realm)});
 			return "challenge", challenge
 		elseif (self.step == 2) then
 			local response = parse(message)
@@ -126,7 +127,7 @@
 			
 			--TODO maybe realm support
 			self.username = response["username"]
-			local password_encoding, Y = self.password_handler(response["username"], response["realm"], "DIGEST-MD5")
+			local password_encoding, Y = self.password_handler(response["username"], idna_unicode(response["realm"]), "DIGEST-MD5")
 			if Y == nil then return "failure", "not-authorized"
 			elseif Y == false then return "failure", "account-disabled" end