projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XMPP: add X-Macros to automated parse tokens
[citadel.git]
/
citadel
/
modules
/
xmpp
/
xmpp_sasl_service.c
diff --git
a/citadel/modules/xmpp/xmpp_sasl_service.c
b/citadel/modules/xmpp/xmpp_sasl_service.c
index fd4986137b1fa28ad484dd31f0f1cf726702bea9..ba6dba137446d4705e18a1db083e6e4a455f7478 100644
(file)
--- a/
citadel/modules/xmpp/xmpp_sasl_service.c
+++ b/
citadel/modules/xmpp/xmpp_sasl_service.c
@@
-154,7
+154,7
@@
void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) {
/*
* Non-SASL authentication
*/
/*
* Non-SASL authentication
*/
-void xmpp_non_sasl_authenticate(
char *iq
_id, char *username, char *password, char *resource) {
+void xmpp_non_sasl_authenticate(
StrBuf *IQ
_id, char *username, char *password, char *resource) {
int result;
if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */
int result;
if (CC->logged_in) CtdlUserLogout(); /* Client may try to log in twice. Handle this. */
@@
-165,7
+165,7
@@
void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, cha
if (result == pass_ok) {
XPrint(HKEY("iq"), XCLOSED,
XCPROPERTY("type", "result"),
if (result == pass_ok) {
XPrint(HKEY("iq"), XCLOSED,
XCPROPERTY("type", "result"),
- X
PROPERTY("ID", iq_id, strlen(iq_id)
),
+ X
SPROPERTY("ID", IQ_id
),
TYPE_ARGEND);
/* success */
return;
TYPE_ARGEND);
/* success */
return;
@@
-175,7
+175,7
@@
void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, cha
/* failure */
XPrint(HKEY("iq"), 0,
XCPROPERTY("type", "error"),
/* failure */
XPrint(HKEY("iq"), 0,
XCPROPERTY("type", "error"),
- X
PROPERTY("ID", iq_id, strlen(iq_id)
),
+ X
SPROPERTY("ID", IQ_id
),
TYPE_ARGEND);
XPUT("<error code=\"401\" type=\"auth\">"
"<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"
TYPE_ARGEND);
XPUT("<error code=\"401\" type=\"auth\">"
"<not-authorized xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\"/>"