From a44394eac54ef851f70f7b50814e05d363410be7 Mon Sep 17 00:00:00 2001
From: Jay Satiro <raysatiro@yahoo.com>
Date: Thu, 23 May 2019 04:01:09 -0400
Subject: tests: Fix the line endings for the SASL alt-auth tests

- Change data and protocol sections to CRLF line endings.

Prior to this change the tests would fail or hang, which is because
certain sections such as protocol require CRLF line endings.

Follow-up to grandparent commit which added the tests.

Ref: https://github.com/curl/curl/issues/3653
Ref: https://github.com/curl/curl/pull/3790

NOTE: This commit was cherry-picked and is part of a series of commits
that added the authzid feature for upcoming 7.66.0. The series was
temporarily reverted in db8ec1f so that it would not ship in a 7.65.x
patch release.

Closes https://github.com/curl/curl/pull/4186
---
 tests/data/test848 | 26 +++++++++++++-------------
 tests/data/test849 |  6 +++---
 tests/data/test892 | 24 ++++++++++++------------
 tests/data/test893 |  6 +++---
 tests/data/test953 | 20 ++++++++++----------
 tests/data/test954 |  6 +++---
 6 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/tests/data/test848 b/tests/data/test848
index bfea56898..2b4a30b2a 100644
--- a/tests/data/test848
+++ b/tests/data/test848
@@ -17,13 +17,13 @@ REPLY AUTHENTICATE +
 REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= A002 OK AUTHENTICATE completed
 </servercmd>
 <data>
-From: me@somewhere
-To: fake@nowhere
-
-body
-
---
-  yours sincerely
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+  yours sincerely
 </data>
 </reply>
 
@@ -45,12 +45,12 @@ IMAP plain authentication with alternative authorization identity
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-A001 CAPABILITY
-A002 AUTHENTICATE PLAIN
-c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-A003 SELECT 848
-A004 FETCH 1 BODY[]
-A005 LOGOUT
+A001 CAPABILITY
+A002 AUTHENTICATE PLAIN
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+A003 SELECT 848
+A004 FETCH 1 BODY[]
+A005 LOGOUT
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test849 b/tests/data/test849
index 65d5eacf7..8a4b39c00 100644
--- a/tests/data/test849
+++ b/tests/data/test849
@@ -43,9 +43,9 @@ IMAP plain authentication with alternative authorization identity (Not authorize
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "LOGOUT"
 <protocol>
-A001 CAPABILITY
-A002 AUTHENTICATE PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
+A001 CAPABILITY
+A002 AUTHENTICATE PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test892 b/tests/data/test892
index 89a56fbc4..4b8318292 100644
--- a/tests/data/test892
+++ b/tests/data/test892
@@ -19,13 +19,13 @@ REPLY AUTH +
 REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= +OK Login successful
 </servercmd>
 <data>
-From: me@somewhere
-To: fake@nowhere
-
-body
-
---
-  yours sincerely
+From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+  yours sincerely
 </data>
 </reply>
 
@@ -47,11 +47,11 @@ pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CAPA
-AUTH PLAIN
-c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
-RETR 892
-QUIT
+CAPA
+AUTH PLAIN
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+RETR 892
+QUIT
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test893 b/tests/data/test893
index 982c2c897..2a762fc21 100644
--- a/tests/data/test893
+++ b/tests/data/test893
@@ -45,9 +45,9 @@ pop3://%HOSTIP:%POP3PORT/893 -u kurt:xipj3plmq --sasl-authzid ursel
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-CAPA
-AUTH PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
+CAPA
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test953 b/tests/data/test953
index a7636dc22..4a70e1f31 100644
--- a/tests/data/test953
+++ b/tests/data/test953
@@ -29,7 +29,7 @@ smtp
 SMTP plain authentication with alternative authorization identity
  </name>
 <stdin>
-mail body
+mail body
 </stdin>
  <command>
 smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T -
@@ -40,17 +40,17 @@ smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sende
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-EHLO 953
-AUTH PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
-MAIL FROM:<sender@example.com>
-RCPT TO:<recipient@example.com>
-DATA
-QUIT
+EHLO 953
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
 </protocol>
 <upload>
-mail body
-.
+mail body
+.
 </upload>
 </verify>
 </testcase>
diff --git a/tests/data/test954 b/tests/data/test954
index dcc0d2d0b..a5e6bb0d3 100644
--- a/tests/data/test954
+++ b/tests/data/test954
@@ -47,9 +47,9 @@ smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sende
 # The multi interface considers a broken "CONNECT" as a prematurely broken
 # transfer and such a connection will not get a "QUIT"
 <protocol>
-EHLO 954
-AUTH PLAIN
-dXJzZWwAa3VydAB4aXBqM3BsbXE=
+EHLO 954
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
 </protocol>
 </verify>
 </testcase>
-- 
cgit v1.2.1