From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 3 Jan 2015 20:34:06 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v9.01~49
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=7fe2f3119b5dd533fe65e84a291719cb2992db94;hp=8b452cfd0e2dc28052c674be0d79b59bc6b08f0b;p=citadel.git

Merge branch 'master' of git+ssh://git.citadel.org/appl/gitroot/citadel
---

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 7d8fbc67d..e990ae354 100644
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -481,6 +481,14 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 		CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
 	}
 
+	else if (!strcasecmp(el, "query")) {
+		/* already processed , no further action needed here */
+	}
+
+	else if (!strcasecmp(el, "bind")) {
+		/* already processed , no further action needed here */
+	}
+
 	else {
 		XMPP_syslog(LOG_DEBUG, "Ignoring unknown tag <%s>\n", el);
 	}
diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h
index c3281a5c4..27f341054 100644
--- a/citadel/modules/xmpp/serv_xmpp.h
+++ b/citadel/modules/xmpp/serv_xmpp.h
@@ -1,22 +1,16 @@
 /*
- * Copyright (c) 2007-2009 by Art Cancro
+ * Copyright (c) 2007-2009 by the citadel.org team
  *
- *  This program is open source software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 3.
- *  
- *  
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  
- *  
- *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
-typedef struct _citxmpp {			/* Information about the current session */
+typedef struct _citxmpp {		/* Information about the current session */
 	XML_Parser xp;			/* XML parser instance for incoming client stream */
 	char server_name[256];		/* who they think we are */
 	char *chardata;
@@ -95,4 +89,3 @@ extern int XMPPSrvDebugEnable;
 #define XMPPM_syslog(LEVEL, FORMAT)		\
 	DBGLOG(LEVEL) syslog(LEVEL,		\
 			     "XMPP: " FORMAT);
-