diff options
Diffstat (limited to 'contrib/sendmail/src/savemail.c')
| -rw-r--r-- | contrib/sendmail/src/savemail.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/contrib/sendmail/src/savemail.c b/contrib/sendmail/src/savemail.c index b28a70d..073c31f 100644 --- a/contrib/sendmail/src/savemail.c +++ b/contrib/sendmail/src/savemail.c @@ -13,7 +13,7 @@ #include <sendmail.h> -SM_RCSID("@(#)$Id: savemail.c,v 8.299 2002/05/24 20:50:17 gshapiro Exp $") +SM_RCSID("@(#)$Id: savemail.c,v 8.299.2.1 2002/10/23 15:08:47 ca Exp $") static void errbody __P((MCI *, ENVELOPE *, char *)); static bool pruneroute __P((char *)); @@ -545,25 +545,7 @@ returntosender(msg, returnq, flags, e) macdefine(&ee->e_macro, A_PERM, 'r', ""); macdefine(&ee->e_macro, A_PERM, 's', "localhost"); macdefine(&ee->e_macro, A_PERM, '_', "localhost"); -#if SASL - macdefine(&ee->e_macro, A_PERM, macid("{auth_type}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{auth_authen}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{auth_author}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{auth_ssf}"), ""); -#endif /* SASL */ -#if STARTTLS - macdefine(&ee->e_macro, A_PERM, macid("{cert_issuer}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{cert_subject}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{cipher_bits}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{cipher}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{tls_version}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{verify}"), ""); -# if _FFR_TLS_1 - macdefine(&ee->e_macro, A_PERM, macid("{alg_bits}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{cn_issuer}"), ""); - macdefine(&ee->e_macro, A_PERM, macid("{cn_subject}"), ""); -# endif /* _FFR_TLS_1 */ -#endif /* STARTTLS */ + clrsessenvelope(ee); ee->e_puthdr = putheader; ee->e_putbody = errbody; |
