Deleted Added
sdiff udiff text old ( 66497 ) new ( 73191 )
full compact
cfhead.m4 (66497) cfhead.m4 (73191)
1#
1#
2# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
2# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
3# All rights reserved.
4# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
5# Copyright (c) 1988, 1993
6# The Regents of the University of California. All rights reserved.
7#
8# By using this file, you agree to the terms and conditions set
9# forth in the LICENSE file which can be found at the top level of
10# the sendmail distribution.
11#
3# All rights reserved.
4# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
5# Copyright (c) 1988, 1993
6# The Regents of the University of California. All rights reserved.
7#
8# By using this file, you agree to the terms and conditions set
9# forth in the LICENSE file which can be found at the top level of
10# the sendmail distribution.
11#
12# $FreeBSD: head/contrib/sendmail/cf/m4/cfhead.m4 66497 2000-10-01 02:03:50Z gshapiro $
12# $FreeBSD: head/contrib/sendmail/cf/m4/cfhead.m4 73191 2001-02-28 00:22:47Z gshapiro $
13#
14
15######################################################################
16######################################################################
17#####
18##### SENDMAIL CONFIGURATION FILE
19#####
20ifdef(`unix', `dnl

--- 129 unchanged lines hidden (view full) ---

150define(`SITECONFIG',
151`CONCAT(D, $3, $2)
152define(`_CLASS_$3_', `')dnl
153ifelse($3, U, Cw$2 $2.UUCP, `dnl')
154define(`SITE', `ifelse(CONCAT($'2`, $3), SU,
155 CONCAT(CY, $'1`),
156 CONCAT(C, $3, $'1`))')
157sinclude(_CF_DIR_`'siteconfig/$1.m4)')
13#
14
15######################################################################
16######################################################################
17#####
18##### SENDMAIL CONFIGURATION FILE
19#####
20ifdef(`unix', `dnl

--- 129 unchanged lines hidden (view full) ---

150define(`SITECONFIG',
151`CONCAT(D, $3, $2)
152define(`_CLASS_$3_', `')dnl
153ifelse($3, U, Cw$2 $2.UUCP, `dnl')
154define(`SITE', `ifelse(CONCAT($'2`, $3), SU,
155 CONCAT(CY, $'1`),
156 CONCAT(C, $3, $'1`))')
157sinclude(_CF_DIR_`'siteconfig/$1.m4)')
158define(`EXPOSED_USER', `PUSHDIVERT(5)CE$1
158define(`EXPOSED_USER', `PUSHDIVERT(5)C{E}$1
159POPDIVERT`'dnl`'')
159POPDIVERT`'dnl`'')
160ifdef(`_FFR_EXPOSED_USER_FILE', `define(`EXPOSED_USER_FILE', `PUSHDIVERT(5)FE$1
160ifdef(`_FFR_EXPOSED_USER_FILE', `define(`EXPOSED_USER_FILE', `PUSHDIVERT(5)F{E}$1
161POPDIVERT`'dnl`'')', `dnl')
161POPDIVERT`'dnl`'')', `dnl')
162define(`LOCAL_USER', `PUSHDIVERT(5)CL$1
162define(`LOCAL_USER', `PUSHDIVERT(5)C{L}$1
163POPDIVERT`'dnl`'')
164define(`MASQUERADE_AS', `define(`MASQUERADE_NAME', $1)')
163POPDIVERT`'dnl`'')
164define(`MASQUERADE_AS', `define(`MASQUERADE_NAME', $1)')
165define(`MASQUERADE_DOMAIN', `PUSHDIVERT(5)CM$1
165define(`MASQUERADE_DOMAIN', `PUSHDIVERT(5)C{M}$1
166POPDIVERT`'dnl`'')
166POPDIVERT`'dnl`'')
167define(`MASQUERADE_EXCEPTION', `PUSHDIVERT(5)CN$1
167define(`MASQUERADE_EXCEPTION', `PUSHDIVERT(5)C{N}$1
168POPDIVERT`'dnl`'')
168POPDIVERT`'dnl`'')
169define(`MASQUERADE_DOMAIN_FILE', `PUSHDIVERT(5)FM$1
169define(`MASQUERADE_DOMAIN_FILE', `PUSHDIVERT(5)F{M}$1
170POPDIVERT`'dnl`'')
170POPDIVERT`'dnl`'')
171define(`LOCAL_DOMAIN', `PUSHDIVERT(5)Cw$1
171define(`LOCAL_DOMAIN', `PUSHDIVERT(5)C{w}$1
172POPDIVERT`'dnl`'')
173define(`CANONIFY_DOMAIN', `PUSHDIVERT(5)C{Canonify}$1
174POPDIVERT`'dnl`'')
175define(`CANONIFY_DOMAIN_FILE', `PUSHDIVERT(5)F{Canonify}$1
176POPDIVERT`'dnl`'')
172POPDIVERT`'dnl`'')
173define(`CANONIFY_DOMAIN', `PUSHDIVERT(5)C{Canonify}$1
174POPDIVERT`'dnl`'')
175define(`CANONIFY_DOMAIN_FILE', `PUSHDIVERT(5)F{Canonify}$1
176POPDIVERT`'dnl`'')
177define(`GENERICS_DOMAIN', `PUSHDIVERT(5)CG$1
177define(`GENERICS_DOMAIN', `PUSHDIVERT(5)C{G}$1
178POPDIVERT`'dnl`'')
178POPDIVERT`'dnl`'')
179define(`GENERICS_DOMAIN_FILE', `PUSHDIVERT(5)FG$1
179define(`GENERICS_DOMAIN_FILE', `PUSHDIVERT(5)F{G}$1
180POPDIVERT`'dnl`'')
181define(`LDAPROUTE_DOMAIN', `PUSHDIVERT(5)C{LDAPRoute}$1
182POPDIVERT`'dnl`'')
183define(`LDAPROUTE_DOMAIN_FILE', `PUSHDIVERT(5)F{LDAPRoute}$1
184POPDIVERT`'dnl`'')
185define(`VIRTUSER_DOMAIN', `PUSHDIVERT(5)C{VirtHost}$1
186define(`_VIRTHOSTS_')
187POPDIVERT`'dnl`'')
188define(`VIRTUSER_DOMAIN_FILE', `PUSHDIVERT(5)F{VirtHost}$1
189define(`_VIRTHOSTS_')
190POPDIVERT`'dnl`'')
180POPDIVERT`'dnl`'')
181define(`LDAPROUTE_DOMAIN', `PUSHDIVERT(5)C{LDAPRoute}$1
182POPDIVERT`'dnl`'')
183define(`LDAPROUTE_DOMAIN_FILE', `PUSHDIVERT(5)F{LDAPRoute}$1
184POPDIVERT`'dnl`'')
185define(`VIRTUSER_DOMAIN', `PUSHDIVERT(5)C{VirtHost}$1
186define(`_VIRTHOSTS_')
187POPDIVERT`'dnl`'')
188define(`VIRTUSER_DOMAIN_FILE', `PUSHDIVERT(5)F{VirtHost}$1
189define(`_VIRTHOSTS_')
190POPDIVERT`'dnl`'')
191define(`RELAY_DOMAIN', `PUSHDIVERT(5)CR$1
191define(`RELAY_DOMAIN', `PUSHDIVERT(5)C{R}$1
192POPDIVERT`'dnl`'')
192POPDIVERT`'dnl`'')
193define(`RELAY_DOMAIN_FILE', `PUSHDIVERT(5)FR$1
193define(`RELAY_DOMAIN_FILE', `PUSHDIVERT(5)F{R}$1
194POPDIVERT`'dnl`'')
195define(`TRUST_AUTH_MECH', `PUSHDIVERT(5)C{TrustAuthMech}$1
196POPDIVERT`'dnl`'')
197define(`_OPTINS', `ifdef(`$1', `$2$1$3')')
198
199
200m4wrap(`include(_CF_DIR_`m4/proto.m4')')
201

--- 47 unchanged lines hidden (view full) ---

249define(`confCR_FILE', `-o MAIL_SETTINGS_DIR`'relay-domains')
250define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {if_name}, {if_addr}'')
251define(`confMILTER_MACROS_HELO', ``{tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}'')
252define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
253define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
254
255
256divert(0)dnl
194POPDIVERT`'dnl`'')
195define(`TRUST_AUTH_MECH', `PUSHDIVERT(5)C{TrustAuthMech}$1
196POPDIVERT`'dnl`'')
197define(`_OPTINS', `ifdef(`$1', `$2$1$3')')
198
199
200m4wrap(`include(_CF_DIR_`m4/proto.m4')')
201

--- 47 unchanged lines hidden (view full) ---

249define(`confCR_FILE', `-o MAIL_SETTINGS_DIR`'relay-domains')
250define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {if_name}, {if_addr}'')
251define(`confMILTER_MACROS_HELO', ``{tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}'')
252define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
253define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
254
255
256divert(0)dnl
257VERSIONID(`$Id: cfhead.m4,v 8.76.4.13 2000/08/24 17:09:50 gshapiro Exp $')
257VERSIONID(`$Id: cfhead.m4,v 8.76.4.15 2001/02/14 04:07:20 gshapiro Exp $')