← Back to branch summary

~ubuntu-branches/ubuntu/karmic/squirrelmail/karmic

« back to all changes in this revision

Viewing changes to class/deliver/Deliver_SMTP.class.php

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2006-07-04 14:49:23 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060704144923-w5l1xdbivclpkmda
Tags: 2:1.4.7-1
http://bugs.debian.org/373731
http://bugs.debian.org/375782
http://bugs.debian.org/376605
* New upstream bugfix release.
  + Addresses some low-impact, theoretical or disputed security bugs,
    for which the code is tightened just-in-case:
    - Possible local file inclusion (Closes: #373731, CVE-2006-2842)
    - XSS in search.php (Closes: #375782, CVE-2006-3174)
  + Adds note to db-backend.txt about postgreSQL (Closes: #376605).

* Checked for standards version to 3.7.2, no changes necessary.
* Update maintainer address.

Show diffs side-by-side

added added

removed removed

Lines of Context:
class/deliver/Deliver_SMTP.class.php
3
3
/**
4
4
 * Deliver_SMTP.class.php
5
5
 *
6
 
 * Delivery backend for the Deliver class.
 
6
 * SMTP delivery backend for the Deliver class.
7
7
 *
8
8
 * @copyright © 1999-2006 The SquirrelMail Project Team
9
9
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
10
 
 * @version $Id: Deliver_SMTP.class.php,v 1.13.2.13 2006/02/03 22:27:46 jervfors Exp $
 
10
 * @version $Id: Deliver_SMTP.class.php,v 1.13.2.16 2006/05/12 14:54:09 kink Exp $
11
11
 * @package squirrelmail
12
12
 */
13
13
 
49
49
            $content_type->type1 == 'report' &&
50
50
            isset($content_type->properties['report-type']) &&
51
51
            $content_type->properties['report-type']=='disposition-notification') {
 
52
            // reinitialize the from object because otherwise the from header somehow
 
53
            // is affected. This $from var is used for smtp command MAIL FROM which
 
54
            // is not the same as what we put in the rfc822 header.
 
55
            $from = new AddressStructure();
52
56
            $from->host = '';
53
57
            $from->mailbox = '';
54
58
        }
89
93
        fputs($stream, "EHLO $helohost\r\n");
90
94
        $tmp = fgets($stream,1024);
91
95
        if ($this->errorCheck($tmp,$stream)) {
92
 
            // fall back to HELO if EHLO is not supported
93
 
            if ($this->dlv_ret_nr == '500') {
 
96
            // fall back to HELO if EHLO is not supported (error 5xx)
 
97
            if ($this->dlv_ret_nr{0} == '5') {
94
98
                fputs($stream, "HELO $helohost\r\n");
95
99
                $tmp = fgets($stream,1024);
96
100
                if ($this->errorCheck($tmp,$stream)) {
351
355
    }
352
356
}
353
357
 
354
 
?>
 
 
b'\\ No newline at end of file'
 
358
?>