*** cf/README.orig	Mon Oct  6 08:21:01 2003
--- cf/README	Mon Oct  6 08:21:49 2003
***************
*** 4097,4103 ****
  confMILTER_MACROS_HELO	Milter.macros.helo
  					[{tls_version}, {cipher},
  					{cipher_bits}, {cert_subject},
! 					{cert_issuer}] Macros to transmit to
  					milters after HELO/EHLO command.
  confMILTER_MACROS_ENVFROM	Milter.macros.envfrom
  					[i, {auth_type}, {auth_authen},
--- 4097,4104 ----
  confMILTER_MACROS_HELO	Milter.macros.helo
  					[{tls_version}, {cipher},
  					{cipher_bits}, {cert_subject},
! 					{cert_issuer}, {illegalpipe}]
! 					Macros to transmit to
  					milters after HELO/EHLO command.
  confMILTER_MACROS_ENVFROM	Milter.macros.envfrom
  					[i, {auth_type}, {auth_authen},
*** cf/m4/cfhead.m4.orig	Mon Oct  6 08:09:17 2003
--- cf/m4/cfhead.m4	Thu Apr  3 10:58:01 2003
***************
*** 299,305 ****
  define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward')
  define(`confCR_FILE', `-o MAIL_SETTINGS_DIR`'relay-domains')
  define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {if_name}, {if_addr}'')
! define(`confMILTER_MACROS_HELO', ``{tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}, {illegalpipe}'')
  define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
  define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
  
--- 299,305 ----
  define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward')
  define(`confCR_FILE', `-o MAIL_SETTINGS_DIR`'relay-domains')
  define(`confMILTER_MACROS_CONNECT', ``j, _, {daemon_name}, {if_name}, {if_addr}'')
! define(`confMILTER_MACROS_HELO', ``{tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}'')
  define(`confMILTER_MACROS_ENVFROM', ``i, {auth_type}, {auth_authen}, {auth_ssf}, {auth_author}, {mail_mailer}, {mail_host}, {mail_addr}'')
  define(`confMILTER_MACROS_ENVRCPT', ``{rcpt_mailer}, {rcpt_host}, {rcpt_addr}'')
  
*** sendmail/milter.c.orig	Sun Oct  5 17:21:28 2003
--- sendmail/milter.c	Mon Oct  6 08:06:27 2003
***************
*** 3289,3294 ****
--- 3289,3303 ----
  		}
  	}
  
+ #if _FFR_ILLEGAL_PIPE
+ 	if (sm_io_getinfo(InChannel, SM_IO_IS_READABLE, NULL) > 0)
+ 		macdefine(&e->e_macro, A_TEMP,
+ 			  macid("{illegalpipe}"), "true");
+ 	else
+ 		macdefine(&e->e_macro, A_TEMP,
+ 			  macid("{illegalpipe}"), "false");
+ #endif /* _FFR_ILLEGAL_PIPE */
+ 
  	response = milter_command(SMFIC_HELO, helo, strlen(helo) + 1,
  				  MilterHeloMacros, e, state);
  	milter_per_connection_check(e);
*** doc/op/op.me.orig	Mon Oct  6 08:23:11 2003
--- doc/op/op.me	Mon Oct  6 08:27:37 2003
***************
*** 4922,4927 ****
--- 4922,4931 ----
  .)b
  .ip ${if_name_out}
  The name of the interface of an outgoing connection.
+ .ip ${illegalpipe}
+ Milter use in xxfi_helo only. Set to "true" if there is pending
+ input after reading the EHLO/HELO command, otherwise
+ set to "false".
  .ip ${load_avg}
  The current load average.
  .ip ${mail_addr}
*** libmilter/docs/smfi_getsymval.html.orig	Mon Oct  6 08:15:48 2003
--- libmilter/docs/smfi_getsymval.html	Mon Oct  6 08:16:54 2003
***************
*** 65,71 ****
  <table border="1" cellspacing=0>
  <tr bgcolor="#dddddd"><th>Sent With</th><th>Macros</th></tr>
  <tr><td>xxfi_connect</td>    <td>daemon_name, if_name, if_addr, j, _</td></tr>
! <tr><td>xxfi_helo</td>       <td>tls_version, cipher, cipher_bits, cert_subject, cert_issuer</td></tr>
  <tr><td>xxfi_envfrom</td>    <td>i, auth_type, auth_authen, auth_ssf, auth_author,
                  mail_mailer, mail_host, mail_addr</td></tr>
  <tr><td>xxfi_envrcpt</td>    <td>rcpt_mailer, rcpt_host, rcpt_addr</td></tr>
--- 65,71 ----
  <table border="1" cellspacing=0>
  <tr bgcolor="#dddddd"><th>Sent With</th><th>Macros</th></tr>
  <tr><td>xxfi_connect</td>    <td>daemon_name, if_name, if_addr, j, _</td></tr>
! <tr><td>xxfi_helo</td>       <td>tls_version, cipher, cipher_bits, cert_subject, cert_issuer, illegalpipe</td></tr>
  <tr><td>xxfi_envfrom</td>    <td>i, auth_type, auth_authen, auth_ssf, auth_author,
                  mail_mailer, mail_host, mail_addr</td></tr>
  <tr><td>xxfi_envrcpt</td>    <td>rcpt_mailer, rcpt_host, rcpt_addr</td></tr>