← Back to branch summary

~ubuntu-branches/debian/sid/postfix/sid

« back to all changes in this revision

Viewing changes to src/smtp/smtp_chat.c

  • Committer: Package Import Robot
  • Author(s): LaMont Jones, LaMont Jones, localization folks
  • Date: 2014-02-11 07:44:30 UTC
  • mfrom: (1.1.41)
  • Revision ID: package-import@ubuntu.com-20140211074430-91tdwgjriazawdz4
Tags: 2.11.0-1
http://bugs.debian.org/734893
[LaMont Jones]

* New upstream release: 2.11.0

[localization folks]

* l10n: Updated German translations.  Closes: #734893 (Helge Kreutzmann)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/smtp/smtp_chat.c
359
359
        if (session->features & SMTP_FEATURE_PIPELINING) {
360
360
            msg_warn("%s: non-%s response from %s: %.100s",
361
361
                     session->state->request->queue_id,
362
 
                     (session->state->misc_flags & SMTP_MISC_FLAG_USE_LMTP) ?
363
 
                     "LMTP" : "ESMTP", session->namaddrport,
364
 
                     STR(session->buffer));
 
362
                     smtp_mode ? "ESMTP" : "LMTP",
 
363
                     session->namaddrport, STR(session->buffer));
365
364
            if (var_helpful_warnings)
366
365
                msg_warn("to prevent loss of mail, turn off command pipelining "
367
 
                         "for %s with the %s parameter", session->addr,
368
 
                    (session->state->misc_flags & SMTP_MISC_FLAG_USE_LMTP) ?
369
 
                         VAR_LMTP_EHLO_DIS_MAPS : VAR_SMTP_EHLO_DIS_MAPS);
 
366
                         "for %s with the %s parameter",
 
367
                         STR(session->iterator->addr),
 
368
                         SMTP_X(EHLO_DIS_MAPS));
370
369
        }
371
370
    }
372
371
 
469
468
                      mail_addr_mail_daemon());
470
469
    post_mail_fprintf(notice, "To: %s (Postmaster)", var_error_rcpt);
471
470
    post_mail_fprintf(notice, "Subject: %s %s client: errors from %s",
472
 
                      var_mail_name,
473
 
                      (session->state->misc_flags &
474
 
                       SMTP_MISC_FLAG_USE_LMTP) ? "LMTP" : "SMTP",
 
471
                      var_mail_name, smtp_mode ? "SMTP" : "LMTP",
475
472
                      session->namaddrport);
476
473
    post_mail_fputs(notice, "");
477
474
    post_mail_fprintf(notice, "Unexpected response from %s.",