diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-29 15:04:19 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-29 15:04:19 +0000 |
| commit | cdeca65aec47189565db5f42139c9d99df6e8c0f (patch) | |
| tree | fd4e47a3e1b463ba35581ef86d9ca049c93f7a67 | |
| parent | 2258d856235b29222ee82c17d9f6490c8dc7284c (diff) | |
| download | forums-cdeca65aec47189565db5f42139c9d99df6e8c0f.tar forums-cdeca65aec47189565db5f42139c9d99df6e8c0f.tar.gz forums-cdeca65aec47189565db5f42139c9d99df6e8c0f.tar.bz2 forums-cdeca65aec47189565db5f42139c9d99df6e8c0f.tar.xz forums-cdeca65aec47189565db5f42139c9d99df6e8c0f.zip | |
Fix Jabber SASL PLAIN authentication failures. (Bug #52995)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10245 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_jabber.php | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index e48d613a03..0d3299eb89 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -211,6 +211,7 @@ <li>[Fix] Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)</li> <li>[Fix] Only check whether forum image exists if forum image is specified. (Bug #51905)</li> <li>[Fix] Fixed database updater for changes to columns having default value in MSSQL (adding/dropping constraints).</li> + <li>[Fix] Jabber SASL PLAIN authentication failures. (Bug #52995)</li> <li>[Change] Database updater now supports checking for existing/missing indexes.</li> <li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index 6d5021b9aa..16dce16a72 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -476,8 +476,9 @@ class jabber } else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls']))) { + // http://www.ietf.org/rfc/rfc4616.txt (PLAIN SASL Mechanism) $this->send("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>" - . base64_encode(chr(0) . $this->username . '@' . $this->server . chr(0) . $this->password) . + . base64_encode($this->username . '@' . $this->server . chr(0) . $this->username . chr(0) . $this->password) . '</auth>'); } else if (in_array('ANONYMOUS', $methods)) |