~ubuntu-branches/ubuntu/maverick/postfix/maverick-security

« back to all changes in this revision

Viewing changes to src/smtpd/smtpd_state.c

  • Committer: Bazaar Package Importer
  • Author(s): LaMont Jones, Wietse Venema, LaMont Jones
  • Date: 2009-06-03 14:17:08 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20090603141708-o9u59xlor7nmd2x1
[Wietse Venema]

* New upstream release: 2.6.2~rc1

[LaMont Jones]

* move postfix-add-{filter,policy} manpages to section 8, and deliver
* provide: default-mta on ubuntu

Show diffs side-by-side

added added

removed removed

Lines of Context:
149
149
#ifdef USE_SASL_AUTH
150
150
    if (SMTPD_STAND_ALONE(state))
151
151
        var_smtpd_sasl_enable = 0;
152
 
    if (var_smtpd_sasl_enable)
153
 
        smtpd_sasl_connect(state, VAR_SMTPD_SASL_OPTS, var_smtpd_sasl_opts);
 
152
    smtpd_sasl_set_inactive(state);
154
153
#endif
155
154
 
156
155
    state->milter_argv = 0;
216
215
        vstring_free(state->dsn_buf);
217
216
    if (state->dsn_orcpt_buf)
218
217
        vstring_free(state->dsn_orcpt_buf);
219
 
 
220
 
#ifdef USE_SASL_AUTH
221
 
    if (var_smtpd_sasl_enable)
222
 
        smtpd_sasl_disconnect(state);
223
 
#endif
224
218
}