From 2976b35710982e72d499db16d648eee7b2cfaa94 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 19 Dec 2018 00:13:23 -0500 Subject: [PATCH] xmpp non sasl authenticate does not need the resource name --- citadel/modules/xmpp/serv_xmpp.c | 3 +-- citadel/modules/xmpp/serv_xmpp.h | 2 +- citadel/modules/xmpp/xmpp_sasl_service.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c index 7e42db01a..d62bcfe46 100644 --- a/citadel/modules/xmpp/serv_xmpp.c +++ b/citadel/modules/xmpp/serv_xmpp.c @@ -392,8 +392,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) { xmpp_non_sasl_authenticate( XMPP->iq_id, XMPP->iq_client_username, - XMPP->iq_client_password, - XMPP->iq_client_resource + XMPP->iq_client_password ); } diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h index 222c8f79f..29ecd1207 100644 --- a/citadel/modules/xmpp/serv_xmpp.h +++ b/citadel/modules/xmpp/serv_xmpp.h @@ -72,7 +72,7 @@ void xmpp_process_events(void); void xmpp_presence_notify(char *, int); void xmpp_roster_item(struct CitContext *); void xmpp_send_message(char *, char *); -void xmpp_non_sasl_authenticate(char *, char *, char *, char *); +void xmpp_non_sasl_authenticate(char *, char *, char *); void xmpp_massacre_roster(void); void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void); int xmpp_is_visible(struct CitContext *from, struct CitContext *to_whom); diff --git a/citadel/modules/xmpp/xmpp_sasl_service.c b/citadel/modules/xmpp/xmpp_sasl_service.c index ce2c8890b..da7637498 100644 --- a/citadel/modules/xmpp/xmpp_sasl_service.c +++ b/citadel/modules/xmpp/xmpp_sasl_service.c @@ -147,7 +147,7 @@ void xmpp_sasl_auth(char *sasl_auth_mech, char *authstring) { /* * Non-SASL authentication */ -void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password, char *resource) { +void xmpp_non_sasl_authenticate(char *iq_id, char *username, char *password) { int result; char xmlbuf[256]; -- 2.30.2