Diff

core/s2smanager.lua @ 3765:0731e5432baa

Merge Tobias->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 17 Dec 2010 13:50:33 +0000
parent 3733:26571a99f6e6
child 3947:21391aa2d9bc
line wrap: on
line diff
--- a/core/s2smanager.lua	Tue Dec 14 18:54:55 2010 +0100
+++ b/core/s2smanager.lua	Fri Dec 17 13:50:33 2010 +0000
@@ -27,7 +27,7 @@
 local st = require "stanza";
 local stanza = st.stanza;
 local nameprep = require "util.encodings".stringprep.nameprep;
-local cert_verify_identity = require "util.certverification".verify_identity;
+local cert_verify_identity = require "util.x509".verify_identity;
 
 local fire_event = prosody.events.fire_event;
 local uuid_gen = require "util.uuid".generate;