diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2000-10-01 02:03:50 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2000-10-01 02:03:50 +0000 |
| commit | 1bbf49b55a2601a4b47f84ef0db64d5bbc97608f (patch) | |
| tree | 8243eef774bd2693d62f2204f2be075a5b646c32 /contrib/sendmail/cf/m4 | |
| parent | 0cc8aac437ca5de8f94291323499241c949261f9 (diff) | |
| download | FreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.zip FreeBSD-src-1bbf49b55a2601a4b47f84ef0db64d5bbc97608f.tar.gz | |
Fix conflicts from merge of sendmail 8.11.1
Diffstat (limited to 'contrib/sendmail/cf/m4')
| -rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index 5a7bad3..940a072 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -157,6 +157,8 @@ define(`SITE', `ifelse(CONCAT($'2`, $3), SU, sinclude(_CF_DIR_`'siteconfig/$1.m4)') define(`EXPOSED_USER', `PUSHDIVERT(5)CE$1 POPDIVERT`'dnl`'') +ifdef(`_FFR_EXPOSED_USER_FILE', `define(`EXPOSED_USER_FILE', `PUSHDIVERT(5)FE$1 +POPDIVERT`'dnl`'')', `dnl') define(`LOCAL_USER', `PUSHDIVERT(5)CL$1 POPDIVERT`'dnl`'') define(`MASQUERADE_AS', `define(`MASQUERADE_NAME', $1)') @@ -252,4 +254,4 @@ define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'') divert(0)dnl -VERSIONID(`$Id: cfhead.m4,v 8.76.4.9 2000/07/11 23:50:30 geir Exp $') +VERSIONID(`$Id: cfhead.m4,v 8.76.4.13 2000/08/24 17:09:50 gshapiro Exp $') |
