| deliver.c (42575) | deliver.c (43730) |
|---|---|
| 1/* 2 * Copyright (c) 1998 Sendmail, Inc. All rights reserved. 3 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 4 * Copyright (c) 1988, 1993 5 * The Regents of the University of California. All rights reserved. 6 * 7 * By using this file, you agree to the terms and conditions set 8 * forth in the LICENSE file which can be found at the top level of 9 * the sendmail distribution. 10 * 11 */ 12 13#ifndef lint | 1/* 2 * Copyright (c) 1998 Sendmail, Inc. All rights reserved. 3 * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. 4 * Copyright (c) 1988, 1993 5 * The Regents of the University of California. All rights reserved. 6 * 7 * By using this file, you agree to the terms and conditions set 8 * forth in the LICENSE file which can be found at the top level of 9 * the sendmail distribution. 10 * 11 */ 12 13#ifndef lint |
| 14static char sccsid[] = "@(#)deliver.c 8.366 (Berkeley) 12/18/1998"; | 14static char sccsid[] = "@(#)deliver.c 8.367 (Berkeley) 1/18/1999"; |
| 15#endif /* not lint */ 16 17#include "sendmail.h" 18#include <errno.h> 19#include <grp.h> 20#if NAMED_BIND 21#include <resolv.h> 22#endif --- 1975 unchanged lines hidden (view full) --- 1998 else if (!clever) 1999 { 2000 /* 2001 ** Format and send message. 2002 */ 2003 2004 mci->mci_contentlen = 0; 2005 putfromline(mci, e); | 15#endif /* not lint */ 16 17#include "sendmail.h" 18#include <errno.h> 19#include <grp.h> 20#if NAMED_BIND 21#include <resolv.h> 22#endif --- 1975 unchanged lines hidden (view full) --- 1998 else if (!clever) 1999 { 2000 /* 2001 ** Format and send message. 2002 */ 2003 2004 mci->mci_contentlen = 0; 2005 putfromline(mci, e); |
| 2006 (*e->e_puthdr)(mci, e->e_header, e); | 2006 (*e->e_puthdr)(mci, e->e_header, e, M87F_OUTER); |
| 2007 (*e->e_putbody)(mci, e, NULL); 2008 2009 /* get the exit status */ 2010 rcode = endmailer(mci, e, pv); 2011 } 2012 else 2013#if SMTP 2014 { --- 1549 unchanged lines hidden (view full) --- 3564 /* XXX should really parse it here -- and use a class XXX */ 3565 if (strncasecmp(p, "text/plain", 10) == 0 && 3566 (p[10] == '\0' || p[10] == ' ' || p[10] == ';')) 3567 mcibuf.mci_flags |= MCIF_CVT7TO8; 3568 } 3569#endif 3570 3571 putfromline(&mcibuf, e); | 2007 (*e->e_putbody)(mci, e, NULL); 2008 2009 /* get the exit status */ 2010 rcode = endmailer(mci, e, pv); 2011 } 2012 else 2013#if SMTP 2014 { --- 1549 unchanged lines hidden (view full) --- 3564 /* XXX should really parse it here -- and use a class XXX */ 3565 if (strncasecmp(p, "text/plain", 10) == 0 && 3566 (p[10] == '\0' || p[10] == ' ' || p[10] == ';')) 3567 mcibuf.mci_flags |= MCIF_CVT7TO8; 3568 } 3569#endif 3570 3571 putfromline(&mcibuf, e); |
| 3572 (*e->e_puthdr)(&mcibuf, e->e_header, e); | 3572 (*e->e_puthdr)(&mcibuf, e->e_header, e, M87F_OUTER); |
| 3573 (*e->e_putbody)(&mcibuf, e, NULL); 3574 putline("\n", &mcibuf); 3575 if (fflush(f) < 0 || ferror(f)) 3576 { 3577 message("451 I/O error: %s", errstring(errno)); 3578 setstat(EX_IOERR); 3579 } 3580 --- 178 unchanged lines hidden --- | 3573 (*e->e_putbody)(&mcibuf, e, NULL); 3574 putline("\n", &mcibuf); 3575 if (fflush(f) < 0 || ferror(f)) 3576 { 3577 message("451 I/O error: %s", errstring(errno)); 3578 setstat(EX_IOERR); 3579 } 3580 --- 178 unchanged lines hidden --- |