diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-09-11 19:02:52 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-09-11 19:02:52 +0000 |
| commit | b9658e618d8e5a4f53d0291f13222e5e19dd695f (patch) | |
| tree | 347b055971d930905e6c510a18587adc19a2f124 /gnu/usr.sbin/sendmail/cf/mailer/phquery.m4 | |
| parent | 03eaf40ad95c4f4c5613308db2dfe2f64ee709b0 (diff) | |
merge in sendmail 8.12.0 with BSD Makefiles and mdoc man pages
Diffstat (limited to 'gnu/usr.sbin/sendmail/cf/mailer/phquery.m4')
| -rw-r--r-- | gnu/usr.sbin/sendmail/cf/mailer/phquery.m4 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/mailer/phquery.m4 b/gnu/usr.sbin/sendmail/cf/mailer/phquery.m4 index 3d1263aedab..2b709d7c33a 100644 --- a/gnu/usr.sbin/sendmail/cf/mailer/phquery.m4 +++ b/gnu/usr.sbin/sendmail/cf/mailer/phquery.m4 @@ -1,6 +1,6 @@ PUSHDIVERT(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -14,9 +14,6 @@ PUSHDIVERT(-1) # Contributed by Kimmo Suominen <kim@tac.nyc.ny.us>. # -ifdef(`_MAILER_local_', `', - `errprint(`*** MAILER(`local') must appear before MAILER(`phquery')')')dnl - ifdef(`PH_MAILER_PATH',, `define(`PH_MAILER_PATH', /usr/local/etc/phquery)') _DEFIFNOT(`PH_MAILER_FLAGS', `ehmu') ifdef(`PH_MAILER_ARGS',, `define(`PH_MAILER_ARGS', `phquery -- $u')') @@ -27,7 +24,7 @@ POPDIVERT ### PH Mailer specification ### #################################### -VERSIONID(`$Sendmail: phquery.m4,v 8.15 1999/10/18 04:57:54 gshapiro Exp $') +VERSIONID(`$Sendmail: phquery.m4,v 8.16 2000/09/02 17:46:43 ca Exp $') Mph, P=PH_MAILER_PATH, F=_MODMF_(CONCAT(`nrDFM', PH_MAILER_FLAGS), `PH'), S=EnvFromL, R=EnvToL/HdrToL, T=DNS/RFC822/X-Unix, |