← Back to branch summary

~ubuntu-branches/ubuntu/raring/postfix/raring

« back to all changes in this revision

Viewing changes to src/qmqpd/qmqpd.c

Tags: upstream-2.2.6
Import upstream version 2.2.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qmqpd/qmqpd.c
35
35
/* CONFIGURATION PARAMETERS
36
36
/* .ad
37
37
/* .fi
38
 
/*      Changes to \fBmain.cf\fR are picked up automatically, as qmqpd(8)
 
38
/*      Changes to \fBmain.cf\fR are picked up automatically, as \fBqmqpd\fR(8)
39
39
/*      processes run for only a limited amount of time. Use the command
40
40
/*      "\fBpostfix reload\fR" to speed up a change.
41
41
/*
42
42
/*      The text below provides only a parameter summary. See
43
 
/*      postconf(5) for more details including examples.
 
43
/*      \fBpostconf\fR(5) for more details including examples.
44
44
/* CONTENT INSPECTION CONTROLS
45
45
/* .ad
46
46
/* .fi
49
49
/*      it is queued.
50
50
/* .IP "\fBreceive_override_options (empty)\fR"
51
51
/*      Enable or disable recipient validation, built-in content
52
 
/*      filtering, or address rewriting.
 
52
/*      filtering, or address mapping.
53
53
/* RESOURCE AND RATE CONTROLS
54
54
/* .ad
55
55
/* .fi
115
115
/*      records, so that "smtpd" becomes, for example, "postfix/smtpd".
116
116
/* .IP "\fBverp_delimiter_filter (-=+)\fR"
117
117
/*      The characters Postfix accepts as VERP delimiter characters on the
118
 
/*      Postfix sendmail(1) command line and in SMTP commands.
 
118
/*      Postfix \fBsendmail\fR(1) command line and in SMTP commands.
119
119
/* SEE ALSO
120
120
/*      http://cr.yp.to/proto/qmqp.html, QMQP protocol
121
121
/*      cleanup(8), message canonicalization
234
234
    /*
235
235
     * Connect to the cleanup server. Log client name/address with queue ID.
236
236
     */
237
 
    cleanup_flags = CLEANUP_FLAG_MASK_EXTERNAL;
238
 
    if (qmqpd_input_transp_mask & INPUT_TRANSP_ADDRESS_MAPPING)
239
 
        cleanup_flags &= ~(CLEANUP_FLAG_BCC_OK | CLEANUP_FLAG_MAP_OK);
240
 
    if (qmqpd_input_transp_mask & INPUT_TRANSP_HEADER_BODY)
241
 
        cleanup_flags &= ~CLEANUP_FLAG_FILTER;
242
 
 
 
237
    cleanup_flags = input_transp_cleanup(CLEANUP_FLAG_MASK_EXTERNAL,
 
238
                                         qmqpd_input_transp_mask);
243
239
    state->dest = mail_stream_service(MAIL_CLASS_PUBLIC, var_cleanup_service);
244
240
    if (state->dest == 0
245
241
        || attr_print(state->dest->stream, ATTR_FLAG_NONE,
323
319
                    MAIL_ATTR_CLIENT_NAME, state->name);
324
320
    if (IS_AVAIL_CLIENT_ADDR(state->addr))
325
321
        rec_fprintf(state->cleanup, REC_TYPE_ATTR, "%s=%s",
326
 
                    MAIL_ATTR_CLIENT_ADDR, state->addr);
 
322
                    MAIL_ATTR_CLIENT_ADDR, state->rfc_addr);
327
323
    if (IS_AVAIL_CLIENT_NAMADDR(state->namaddr))
328
324
        rec_fprintf(state->cleanup, REC_TYPE_ATTR, "%s=%s",
329
325
                    MAIL_ATTR_ORIGIN, state->namaddr);
402
398
     */
403
399
    rec_fputs(state->cleanup, REC_TYPE_MESG, "");
404
400
    rec_fprintf(state->cleanup, REC_TYPE_NORM, "Received: from %s (%s [%s])",
405
 
                state->name, state->name, state->addr);
 
401
                state->name, state->name, state->rfc_addr);
406
402
    if (state->rcpt_count == 1 && state->recipient) {
407
403
        rec_fprintf(state->cleanup, REC_TYPE_NORM,
408
404
                    "\tby %s (%s) with %s id %s",