← Back to branch summary

~ubuntu-branches/ubuntu/maverick/postfix/maverick-backports

« back to all changes in this revision

Viewing changes to src/smtp/smtp_connect.c

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones
  • Date: 2006-12-12 15:33:53 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20061212153353-q7mkymc0ti2uqzsn
Tags: 2.3.5-1
http://bugs.debian.org/402788
* New upstream version
* mydomain needs some cleanup if we're upgrading from < 2.3.5-1 on a machine
  where hostname(2) is a short name.  Bug introduced in 2.3.3-2.  Closes: #402788

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/smtp/smtp_connect.c
379
379
    bad_session = THIS_SESSION_IS_BAD;          /* smtp_quit() may fail */
380
380
    if (THIS_SESSION_IS_EXPIRED)
381
381
        smtp_quit(state);                       /* also disables caching */
382
 
    if (THIS_SESSION_IS_CACHED) {
 
382
    if (THIS_SESSION_IS_CACHED
 
383
        /* Redundant tests for safety... */
 
384
        && vstream_ferror(session->stream) == 0
 
385
        && vstream_ftimeout(session->stream) == 0
 
386
        && vstream_feof(session->stream) == 0) {
383
387
        smtp_save_session(state);
384
388
    } else {
385
389
        smtp_session_free(session);
493
497
            && smtp_helo(state) != 0) {
494
498
            if (!THIS_SESSION_IS_DEAD
495
499
                && vstream_ferror(session->stream) == 0
 
500
                && vstream_ftimeout(session->stream) == 0
496
501
                && vstream_feof(session->stream) == 0)
497
502
                smtp_quit(state);
498
503
        } else {
871
876
                     */
872
877
                    if (!THIS_SESSION_IS_DEAD
873
878
                        && vstream_ferror(session->stream) == 0
 
879
                        && vstream_ftimeout(session->stream) == 0
874
880
                        && vstream_feof(session->stream) == 0)
875
881
                        smtp_quit(state);
876
882
                } else {