← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/cleanup/cleanup_addr.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:
src/cleanup/cleanup_addr.c
124
124
            cleanup_masquerade_internal(clean_addr, cleanup_masq_domains);
125
125
    }
126
126
    CLEANUP_OUT_BUF(state, REC_TYPE_FROM, clean_addr);
127
 
    if (state->sender == 0)
128
 
        state->sender = mystrdup(STR(clean_addr));
 
127
    if (state->sender)                          /* XXX Can't happen */
 
128
        myfree(state->sender);
 
129
    state->sender = mystrdup(STR(clean_addr));  /* Used by Milter client */
129
130
    if ((state->flags & CLEANUP_FLAG_BCC_OK)
130
131
        && *STR(clean_addr)
131
132
        && cleanup_send_bcc_maps
166
167
    }
167
168
    cleanup_out_recipient(state, state->dsn_orcpt, state->dsn_notify,
168
169
                          state->orig_rcpt, STR(clean_addr));
169
 
    if (state->recip == 0)
170
 
        state->recip = mystrdup(STR(clean_addr));
 
170
    if (state->recip)                           /* This can happen */
 
171
        myfree(state->recip);
 
172
    state->recip = mystrdup(STR(clean_addr));   /* Used by Milter client */
171
173
    if ((state->flags & CLEANUP_FLAG_BCC_OK)
172
174
        && *STR(clean_addr)
173
175
        && cleanup_rcpt_bcc_maps