summaryrefslogtreecommitdiff
path: root/debian/patches/mime-patch
blob: cf939b2d0e74cb3b9e4c4fe7149a2662e54a3ede (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
*** sendmail-8.9.3/src/mime.c.ORIG      Tue Jan 19 01:35:11 1999
--- sendmail-8.9.3/src/mime.c   Sat Mar 13 01:39:15 1999
***************
*** 443,449 ****
	{
		/* no encoding necessary */
		if (cte != NULL &&
!		    bitset(MCIF_INMIME, mci->mci_flags) &&
		    !bitset(M87F_NO8TO7, flags))
		{
			/*
--- 443,450 ----
	{
		/* no encoding necessary */
		if (cte != NULL &&
!		    bitset(MCIF_CVT8TO7|MCIF_CVT7TO8|MCIF_INMIME,
!			mci->mci_flags) &&
		    !bitset(M87F_NO8TO7, flags))
		{
			/*
*** sendmail-8.9.3/src/headers.c.ORIG	Tue Jan 26 15:54:50 1999
--- sendmail-8.9.3/src/headers.c	Tue Mar 16 20:43:31 1999
***************
*** 1369,1375 ****

  	/*
  	**  If we are converting this to a MIME message, add the
! 	**  MIME headers.
  	*/

  #if MIME8TO7
--- 1369,1375 ----

  	/*
  	**  If we are converting this to a MIME message, add the
! 	**  MIME headers (but not in MIME mode!).
  	*/

  #if MIME8TO7
***************
*** 1377,1386 ****
  	    bitset(EF_HAS8BIT, e->e_flags) &&
  	    !bitset(EF_DONT_MIME, e->e_flags) &&
  	    !bitnset(M_8BITS, mci->mci_mailer->m_flags) &&
! 	    !bitset(MCIF_CVT8TO7|MCIF_CVT7TO8, mci->mci_flags))
  	{
! 		if (hvalue("MIME-Version", e->e_header) == NULL)
! 			putline("MIME-Version: 1.0", mci);
  		if (hvalue("Content-Type", e->e_header) == NULL)
  		{
  			snprintf(obuf, sizeof obuf,
--- 1377,1386 ----
  	    bitset(EF_HAS8BIT, e->e_flags) &&
  	    !bitset(EF_DONT_MIME, e->e_flags) &&
  	    !bitnset(M_8BITS, mci->mci_mailer->m_flags) &&
! 	    !bitset(MCIF_CVT8TO7|MCIF_CVT7TO8|MCIF_INMIME, mci->mci_flags) &&
! 	    hvalue("MIME-Version", e->e_header) == NULL)
  	{
! 		putline("MIME-Version: 1.0", mci);
  		if (hvalue("Content-Type", e->e_header) == NULL)
  		{
  			snprintf(obuf, sizeof obuf,