| savemail.c (102533) | savemail.c (110563) |
|---|---|
| 1/* 2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 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 * | 1/* 2 * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. 3 * All rights reserved. 4 * Copyright (c) 1983, 1995-1997 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/src/savemail.c 102533 2002-08-28 18:12:33Z gshapiro $ | 12 * $FreeBSD: head/contrib/sendmail/src/savemail.c 110563 2003-02-08 20:35:51Z gshapiro $ |
| 13 * 14 */ 15 16#include <sendmail.h> 17 | 13 * 14 */ 15 16#include <sendmail.h> 17 |
| 18SM_RCSID("@(#)$Id: savemail.c,v 8.299 2002/05/24 20:50:17 gshapiro Exp $") | 18SM_RCSID("@(#)$Id: savemail.c,v 8.299.2.1 2002/10/23 15:08:47 ca Exp $") |
| 19 20static void errbody __P((MCI *, ENVELOPE *, char *)); 21static bool pruneroute __P((char *)); 22 23/* 24** SAVEMAIL -- Save mail on error 25** 26** If mailing back errors, mail it back to the originator --- 515 unchanged lines hidden (view full) --- 542 macdefine(&e->e_macro, A_PERM, 'u', NULL); 543 544 /* initialize error envelope */ 545 ee = newenvelope(&errenvelope, e, sm_rpool_new_x(NULL)); 546 macdefine(&ee->e_macro, A_PERM, 'a', "\201b"); 547 macdefine(&ee->e_macro, A_PERM, 'r', ""); 548 macdefine(&ee->e_macro, A_PERM, 's', "localhost"); 549 macdefine(&ee->e_macro, A_PERM, '_', "localhost"); | 19 20static void errbody __P((MCI *, ENVELOPE *, char *)); 21static bool pruneroute __P((char *)); 22 23/* 24** SAVEMAIL -- Save mail on error 25** 26** If mailing back errors, mail it back to the originator --- 515 unchanged lines hidden (view full) --- 542 macdefine(&e->e_macro, A_PERM, 'u', NULL); 543 544 /* initialize error envelope */ 545 ee = newenvelope(&errenvelope, e, sm_rpool_new_x(NULL)); 546 macdefine(&ee->e_macro, A_PERM, 'a', "\201b"); 547 macdefine(&ee->e_macro, A_PERM, 'r', ""); 548 macdefine(&ee->e_macro, A_PERM, 's', "localhost"); 549 macdefine(&ee->e_macro, A_PERM, '_', "localhost"); |
| 550#if SASL 551 macdefine(&ee->e_macro, A_PERM, macid("{auth_type}"), ""); 552 macdefine(&ee->e_macro, A_PERM, macid("{auth_authen}"), ""); 553 macdefine(&ee->e_macro, A_PERM, macid("{auth_author}"), ""); 554 macdefine(&ee->e_macro, A_PERM, macid("{auth_ssf}"), ""); 555#endif /* SASL */ 556#if STARTTLS 557 macdefine(&ee->e_macro, A_PERM, macid("{cert_issuer}"), ""); 558 macdefine(&ee->e_macro, A_PERM, macid("{cert_subject}"), ""); 559 macdefine(&ee->e_macro, A_PERM, macid("{cipher_bits}"), ""); 560 macdefine(&ee->e_macro, A_PERM, macid("{cipher}"), ""); 561 macdefine(&ee->e_macro, A_PERM, macid("{tls_version}"), ""); 562 macdefine(&ee->e_macro, A_PERM, macid("{verify}"), ""); 563# if _FFR_TLS_1 564 macdefine(&ee->e_macro, A_PERM, macid("{alg_bits}"), ""); 565 macdefine(&ee->e_macro, A_PERM, macid("{cn_issuer}"), ""); 566 macdefine(&ee->e_macro, A_PERM, macid("{cn_subject}"), ""); 567# endif /* _FFR_TLS_1 */ 568#endif /* STARTTLS */ | 550 clrsessenvelope(ee); |
| 569 570 ee->e_puthdr = putheader; 571 ee->e_putbody = errbody; 572 ee->e_flags |= EF_RESPONSE|EF_METOO; 573 if (!bitset(EF_OLDSTYLE, e->e_flags)) 574 ee->e_flags &= ~EF_OLDSTYLE; 575 if (bitset(EF_DONT_MIME, e->e_flags)) 576 { --- 1126 unchanged lines hidden --- | 551 552 ee->e_puthdr = putheader; 553 ee->e_putbody = errbody; 554 ee->e_flags |= EF_RESPONSE|EF_METOO; 555 if (!bitset(EF_OLDSTYLE, e->e_flags)) 556 ee->e_flags &= ~EF_OLDSTYLE; 557 if (bitset(EF_DONT_MIME, e->e_flags)) 558 { --- 1126 unchanged lines hidden --- |