← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/exim4/oneiric

« back to all changes in this revision

Viewing changes to src/transports/smtp.c

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2010-12-28 22:20:17 UTC
  • mfrom: (2.3.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20101228222017-r6vg4eqlqy2fk4ul
Tags: 4.73~rc1-1ubuntu1
https://launchpad.net/bugs/697934
http://bugs.debian.org/542726
* Merge from debian unstable.  Remaining changes: (LP: #697934)
  - debian/patches/71_exiq_grep_error_on_messages_without_size.patch:
    + Improve handling of broken messages when "exim4 -bp" (mailq)
      reports lines without size info.
  - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
    we want postfix to be the default.
  - debian/{control,rules}: Add and enable hardened build for PIE.
    (Closes: #542726)
* Drop B-D on libmysqlclient15-dev, resolved in Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/transports/smtp.c
1
 
/* $Cambridge: exim/exim-src/src/transports/smtp.c,v 1.44 2009/11/16 19:56:54 nm4 Exp $ */
 
1
/* $Cambridge: exim/src/src/transports/smtp.c,v 1.44 2009/11/16 19:56:54 nm4 Exp $ */
2
2
 
3
3
/*************************************************
4
4
*     Exim - an Internet mail transport agent    *
1078
1078
  if (!smtp_read_response(&inblock, buffer2, sizeof(buffer2), '2',
1079
1079
      ob->command_timeout))
1080
1080
    {
1081
 
    Ustrncpy(buffer, buffer2, sizeof(buffer));
1082
1081
    if (errno != 0 || buffer2[0] == 0 ||
1083
1082
         (buffer2[0] == '4' && !ob->tls_tempfail_tryclear))
 
1083
      {
 
1084
      Ustrncpy(buffer, buffer2, sizeof(buffer));
1084
1085
      goto RESPONSE_FAILED;
 
1086
      }
1085
1087
    }
1086
1088
 
1087
1089
  /* STARTTLS accepted: try to negotiate a TLS session. */