From 6ae4af377b63ee68f2baa9486302f9e9e251c824 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Jul 22 2011 21:59:05 +0000
Subject: Fixed SMTP AUTH over TLS in case of two AUTH lines

Resolves: rhbz#716628

---

diff --git a/sendmail-8.14.5-auth2.patch b/sendmail-8.14.5-auth2.patch
new file mode 100644
index 0000000..1116442
--- /dev/null
+++ b/sendmail-8.14.5-auth2.patch
@@ -0,0 +1,23 @@
+--- sendmail-8.14.5/sendmail/sendmail.h-	Tue May 24 16:24:39 2011
++++ sendmail-8.14.5/sendmail/sendmail.h	Tue May 24 16:25:29 2011
+@@ -721,9 +721,9 @@
+ #if STARTTLS
+ #define MCIF_TLS	0x00100000	/* STARTTLS supported */
+ #define MCIF_TLSACT	0x00200000	/* STARTTLS active */
+-#define MCIF_EXTENS	(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS)
+ #else /* STARTTLS */
+-#define MCIF_EXTENS	(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT)
++#define MCIF_TLS	0
++#define MCIF_TLSACT	0
+ #endif /* STARTTLS */
+ #define MCIF_DLVR_BY	0x00400000	/* DELIVERBY */
+ #if _FFR_IGNORE_EXT_ON_HELO
+@@ -732,6 +732,8 @@
+ #define MCIF_INLONGLINE 0x01000000	/* in the middle of a long line */
+ #define MCIF_AUTH2	0x02000000	/* got 2 AUTH lines */
+ #define MCIF_ONLY_EHLO	0x10000000	/* use only EHLO in smtpinit */
++
++#define MCIF_EXTENS	(MCIF_EXPN | MCIF_SIZE | MCIF_8BITMIME | MCIF_DSN | MCIF_8BITOK | MCIF_AUTH | MCIF_ENHSTAT | MCIF_TLS | MCIF_AUTH2)
+ 
+ /* states */
+ #define MCIS_CLOSED	0		/* no traffic on this connection */
diff --git a/sendmail.spec b/sendmail.spec
index 9a2e121..303a72e 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -14,7 +14,7 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
@@ -69,7 +69,7 @@ Patch13: sendmail-8.14.4-aliases_dir.patch
 Patch14: sendmail-8.13.7-vacation.patch
 # remove version information from sendmail helpfile
 Patch15: sendmail-8.14.1-noversion.patch
-# do not accept localhost.localdomain as valid address from smtp
+# do not accept localhost.localdomain as valid address from SMTP
 Patch16: sendmail-8.13.1-localdomain.patch
 # build libmilter as DSO
 Patch17: sendmail-8.14.3-sharedmilter.patch
@@ -86,6 +86,8 @@ Patch23: sendmail-8.14.4-sasl2-in-etc.patch
 # add QoS support, patch from Philip Prindeville <philipp@fedoraproject.org>
 # upstream reserved option ID 0xe7 for testing of this new feature, #576643
 Patch25: sendmail-8.14.5-qos.patch
+# fix SMTP AUTH over TLS in case of two AUTH lines, #716628
+Patch26: sendmail-8.14.5-auth2.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libdb-devel
@@ -196,6 +198,7 @@ cp devtools/M4/UNIX/{,shared}library.m4
 %patch22 -p1 -b .libdb5
 %patch23 -p1 -b .sasl2-in-etc
 %patch25 -p1 -b .qos
+%patch26 -p1 -b .auth2
 
 for f in RELEASE_NOTES contrib/etrn.0; do
 	iconv -f iso8859-1 -t utf8 -o ${f}{_,} &&
@@ -673,6 +676,10 @@ exit 0
 
 
 %changelog
+* Fri Jul 22 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-5
+- Fixed SMTP AUTH over TLS in case of two AUTH lines
+  Resolves: rhbz#716628
+
 * Mon Jul 18 2011 Jaroslav Škarvada <jskarvad@redhat.com> - 8.14.5-4
 - Removed dots from description (there are no dots in systemd packaging
   guidelines)