[cl-xmpp-cvs] CVS update: cl-xmpp/cl-xmpp-sasl.asd cl-xmpp/cl-xmpp-sasl.lisp cl-xmpp/cl-xmpp.lisp

[Erik Enge]

Update of /project/cl-xmpp/cvsroot/cl-xmpp
In directory common-lisp.net:/tmp/cvs-serv12512

Modified Files:
	cl-xmpp-sasl.asd cl-xmpp-sasl.lisp cl-xmpp.lisp 
Log Message:
cleaning up a little in the XML we output (removing newlines, etc.)

Date: Mon Nov 14 20:21:06 2005
Author: eenge

Index: cl-xmpp/cl-xmpp-sasl.asd
diff -u cl-xmpp/cl-xmpp-sasl.asd:1.3 cl-xmpp/cl-xmpp-sasl.asd:1.4
--- cl-xmpp/cl-xmpp-sasl.asd:1.3	Sun Nov 13 03:36:10 2005
+++ cl-xmpp/cl-xmpp-sasl.asd	Mon Nov 14 20:21:06 2005
@@ -1,5 +1,5 @@
 ;;;; -*- mode: lisp -*-
-;;;; $Id: cl-xmpp-sasl.asd,v 1.3 2005/11/13 02:36:10 eenge Exp $
+;;;; $Id: cl-xmpp-sasl.asd,v 1.4 2005/11/14 19:21:06 eenge Exp $
 ;;;; $Source: /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp-sasl.asd,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -16,6 +16,6 @@
     :author "Erik Enge"
     :licence "MIT"
     :description "Common Lisp XMPP client implementation with SASL support"
-    :depends-on (:cl-xmpp :cl-base64 :sasl)
+    :depends-on (:cl-xmpp :cl-base64 :cl-sasl)
     :components ((:file "cl-xmpp-sasl")))
 


Index: cl-xmpp/cl-xmpp-sasl.lisp
diff -u cl-xmpp/cl-xmpp-sasl.lisp:1.7 cl-xmpp/cl-xmpp-sasl.lisp:1.8
--- cl-xmpp/cl-xmpp-sasl.lisp:1.7	Mon Nov 14 17:08:42 2005
+++ cl-xmpp/cl-xmpp-sasl.lisp	Mon Nov 14 20:21:06 2005
@@ -1,4 +1,4 @@
-;;;; $Id: cl-xmpp-sasl.lisp,v 1.7 2005/11/14 16:08:42 eenge Exp $
+;;;; $Id: cl-xmpp-sasl.lisp,v 1.8 2005/11/14 19:21:06 eenge Exp $
 ;;;; $Source: /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp-sasl.lisp,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -59,11 +59,7 @@
 
 (defmethod initiate-sasl-authentication ((connection connection) mechanism sasl-client)
   (with-xml-stream (stream connection)
-   (xml-output stream (fmt "<auth mechanism='~a'
-xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>~a</auth>" 
-                           mechanism
-                           (base64:usb8-array-to-base64-string
-                            (sasl:client-step sasl-client nil))))))
+   (xml-output stream (fmt "<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='~a'/>" mechanism))))
 
 (defmethod send-challenge-response ((connection connection) response)
   (with-xml-stream (stream connection)


Index: cl-xmpp/cl-xmpp.lisp
diff -u cl-xmpp/cl-xmpp.lisp:1.14 cl-xmpp/cl-xmpp.lisp:1.15
--- cl-xmpp/cl-xmpp.lisp:1.14	Mon Nov 14 16:14:06 2005
+++ cl-xmpp/cl-xmpp.lisp	Mon Nov 14 20:21:06 2005
@@ -1,4 +1,4 @@
-;;;; $Id: cl-xmpp.lisp,v 1.14 2005/11/14 15:14:06 eenge Exp $
+;;;; $Id: cl-xmpp.lisp,v 1.15 2005/11/14 19:21:06 eenge Exp $
 ;;;; $Source: /project/cl-xmpp/cvsroot/cl-xmpp/cl-xmpp.lisp,v $
 
 ;;;; See the LICENSE file for licensing information.
@@ -331,11 +331,8 @@
   "Begin XML stream.  This should be the first thing to happen on a
 newly connected connection."
   (with-xml-stream (stream connection)
-   (xml-output stream "<?xml version='1.0'?>")
-   (xml-output stream (fmt "<stream:stream to='~a'
-xmlns='jabber:client'
-xmlns:stream='http://etherx.jabber.org/streams'
-version='1.0'>" (or (jid-domain-part connection) (hostname connection))))))
+   (xml-output stream "<?xml version='1.0' ?>")
+   (xml-output stream (fmt "<stream:stream to='~a' xmlns='jabber:client' xmlns:stream='http://etherx.jabber.org/streams' version='1.0'>" (or (jid-domain-part connection) (hostname connection))))))
 
 (defmethod end-xml-stream ((connection connection))
   "Closes the XML stream.  At this point you'd have to