summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2014-09-16 12:28:51 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2014-09-16 12:28:51 +0200
commit013ca2c508386c548ec145832ab8be1e8306cca0 (patch)
treeafbca01f3cb44025c86cf10146dc7c0390cd0e57
parent369dba6206d331f59f0b70804595141b2528c685 (diff)
downloadmonitoring-plugins-013ca2c.tar.gz
Fix check_jabber to work with Openfire servers
The plugin expected: <?xml version='1.0'?> But Openfire sends: <?xml version='1.0' encoding='UTF-8'?>
-rw-r--r--NEWS4
-rw-r--r--plugins/check_tcp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f2898aba..8109f803 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
1This file documents the major additions and syntax changes between releases. 1This file documents the major additions and syntax changes between releases.
2 2
32.0.1 ...
4 FIXES
5 Fix check_jabber to work with Openfire servers
6
32.0 11th July 2014 72.0 11th July 2014
4 ENHANCEMENTS 8 ENHANCEMENTS
5 check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with 9 check_mailq now supports auto detection of qmail, postfix, exim and nullmailer with
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index bd7736b5..fc0adba0 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -172,7 +172,7 @@ main (int argc, char **argv)
172 } 172 }
173 else if (!strncmp(SERVICE, "JABBER", 6)) { 173 else if (!strncmp(SERVICE, "JABBER", 6)) {
174 SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n"; 174 SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
175 EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'"; 175 EXPECT = "<?xml version=\'1.0\'";
176 QUIT = "</stream:stream>\n"; 176 QUIT = "</stream:stream>\n";
177 flags |= FLAG_HIDE_OUTPUT; 177 flags |= FLAG_HIDE_OUTPUT;
178 PORT = 5222; 178 PORT = 5222;