ftp@example.com is now the new anonymous FTP password. I opted for 'ftp' on

the left side of @ to make it short(er).

86 files changed, 94 insertions, 90 deletions

diff --git a/CHANGES b/CHANGES
index e79291319..79b201a86 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@
                                   Changelog
 
 Daniel (13 February 2007)
+- The default password for anonymous FTP connections is now changed to be
+  "ftp@example.com".
+
 - Robert A. Monat made libcurl build fine with VC2005 - it doesn't have
   gmtime_r() like the older VC versions. He also made use of some machine-
   specific defines to differentiate the "OS" define.
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 670ccf439..598f7e32e 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -11,16 +11,17 @@ Curl and libcurl 7.16.2
 
 This release includes the following changes:
  
- o Added CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS
- o Added CURLOPT_HTTP_CONTENT_DECODING, CURLOPT_HTTP_TRANSFER_DECODING and
+ o added CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS
+ o added CURLOPT_HTTP_CONTENT_DECODING, CURLOPT_HTTP_TRANSFER_DECODING and
    --raw
- o Added support for using the NSS library for TLS/SSL
+ o added support for using the NSS library for TLS/SSL
+ o changed default anonymous FTP password
 
 This release includes the following bugfixes:
 
  o in testsuite, update test cookies expiration from 2007-Feb-1 to year 2035 
  o socks5 works
- o 
+ o builds fine with VC2005
 
 This release includes the following known bugs:
 
@@ -38,6 +39,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Yang Tse, Manfred Schwarb, Michael Wallner, Jeff Pohlmeyer, Shmulik Regev,
- Rob Crittenden
+ Rob Crittenden, Robert A. Monat
 
         Thanks! (and sorry if I forgot to mention someone)
diff --git a/lib/urldata.h b/lib/urldata.h
index 853ea44c1..c6d861621 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -45,7 +45,7 @@
 #define DICT_DEFINE3 "/LOOKUP:"
 
 #define CURL_DEFAULT_USER "anonymous"
-#define CURL_DEFAULT_PASSWORD "curl_by_daniel@haxx.se"
+#define CURL_DEFAULT_PASSWORD "ftp@example.com"
 
 #include "cookie.h"
 #include "formdata.h"
diff --git a/tests/data/test100 b/tests/data/test100
index 1829b0500..e27b05b4e 100644
--- a/tests/data/test100
+++ b/tests/data/test100
@@ -48,7 +48,7 @@ filter off really nothing
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE A

diff --git a/tests/data/test101 b/tests/data/test101
index 74886af8c..a9314a71f 100644
--- a/tests/data/test101
+++ b/tests/data/test101
@@ -48,7 +48,7 @@ ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 PORT 127,0,0,1,243,212

 TYPE A

diff --git a/tests/data/test102 b/tests/data/test102
index 99f0e3fc1..692a4f6cd 100644
--- a/tests/data/test102
+++ b/tests/data/test102
@@ -39,7 +39,7 @@ REPLY EPSV 500 no such command
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test103 b/tests/data/test103
index 0cc557b98..27d4cb0ef 100644
--- a/tests/data/test103
+++ b/tests/data/test103
@@ -40,7 +40,7 @@ s/^(PORT 127,0,0,1,)([0-9,]+)/$1/
 </strippart>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD a

 CWD path

diff --git a/tests/data/test104 b/tests/data/test104
index 2806e75ac..162835cd1 100644
--- a/tests/data/test104
+++ b/tests/data/test104
@@ -29,7 +29,7 @@ ftp://%HOSTIP:%FTPPORT/a/path/103 --head
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD a

 CWD path

diff --git a/tests/data/test106 b/tests/data/test106
index fcf99d11e..e855c6e1c 100644
--- a/tests/data/test106
+++ b/tests/data/test106
@@ -36,7 +36,7 @@ FTP GET with type=A style ASCII URL using %20 codes
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD /path with  spaces

 CWD and things2

diff --git a/tests/data/test107 b/tests/data/test107
index c5f611d3c..25b645200 100644
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -40,7 +40,7 @@ works
 </upload>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test108 b/tests/data/test108
index 535339236..ff7b5e131 100644
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -38,7 +38,7 @@ Moooooooooooo
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD CWD

 CWD STOR

diff --git a/tests/data/test109 b/tests/data/test109
index 88b139989..b2e80654d 100644
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -35,7 +35,7 @@ Moooooooooooo
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test110 b/tests/data/test110
index 3a1dbc64a..2b6f42f86 100644
--- a/tests/data/test110
+++ b/tests/data/test110
@@ -40,7 +40,7 @@ REPLY EPSV 500 no such command
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test111 b/tests/data/test111
index f0479d83f..ee81fc6fa 100644
--- a/tests/data/test111
+++ b/tests/data/test111
@@ -36,7 +36,7 @@ ftp://%HOSTIP:%FTPPORT/111 -C 2000
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test112 b/tests/data/test112
index 0f743083d..6e4b20c09 100644
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -35,7 +35,7 @@ worx?
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test114 b/tests/data/test114
index 142dd7346..70f1f6ad6 100644
--- a/tests/data/test114
+++ b/tests/data/test114
@@ -32,7 +32,7 @@ REPLY PASS 314 bluah you f00l!
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test115 b/tests/data/test115
index d2d1f035f..d4df5ebcc 100644
--- a/tests/data/test115
+++ b/tests/data/test115
@@ -34,7 +34,7 @@ REPLY EPSV 314 bluah you f00l!
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test116 b/tests/data/test116
index 59a28f442..e049e6f43 100644
--- a/tests/data/test116
+++ b/tests/data/test116
@@ -38,7 +38,7 @@ REPLY PORT 314 bluah you f00l!
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 QUIT

 </protocol>
diff --git a/tests/data/test117 b/tests/data/test117
index 90df955ec..35c7a1833 100644
--- a/tests/data/test117
+++ b/tests/data/test117
@@ -33,7 +33,7 @@ REPLY TYPE 314 bluah you f00l!
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test118 b/tests/data/test118
index 68e699115..f8f6dd114 100644
--- a/tests/data/test118
+++ b/tests/data/test118
@@ -35,7 +35,7 @@ REPLY EPSV 314 bluah you f00l!
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test119 b/tests/data/test119
index de6be4359..8c13960dd 100644
--- a/tests/data/test119
+++ b/tests/data/test119
@@ -39,7 +39,7 @@ REPLY RETR 314 bluah you f00l!
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 TYPE I

 SIZE 119

diff --git a/tests/data/test120 b/tests/data/test120
index bf1ab0bcc..2e50fabd7 100644
--- a/tests/data/test120
+++ b/tests/data/test120
@@ -39,7 +39,7 @@ REPLY EPSV 314 bluah you f00l!
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test121 b/tests/data/test121
index 2bed51914..de7a56174 100644
--- a/tests/data/test121
+++ b/tests/data/test121
@@ -37,7 +37,7 @@ ftp://%HOSTIP:%FTPPORT/121 -Q "-DELE after_transfer" -Q "DELE before_transfer"
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 DELE before_transfer

 EPSV

diff --git a/tests/data/test122 b/tests/data/test122
index 70c37454a..276068741 100644
--- a/tests/data/test122
+++ b/tests/data/test122
@@ -33,7 +33,7 @@ REPLY EPSV 500 no such command
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test123 b/tests/data/test123
index 34f2aa000..4bbfce9a4 100644
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -30,7 +30,7 @@ ftp://%HOSTIP:%FTPPORT/123 -T log/upload123 -C 51
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test124 b/tests/data/test124
index d2da7750b..6e01dba38 100644
--- a/tests/data/test124
+++ b/tests/data/test124
@@ -34,7 +34,7 @@ REPLY EPSV 314 bluah you f00l!
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test125 b/tests/data/test125
index 1559c9ea8..d9b6205d6 100644
--- a/tests/data/test125
+++ b/tests/data/test125
@@ -32,7 +32,7 @@ REPLY CWD 314 bluah you f00l!
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 QUIT

diff --git a/tests/data/test126 b/tests/data/test126
index 39a312cfb..92ae37bb2 100644
--- a/tests/data/test126
+++ b/tests/data/test126
@@ -34,7 +34,7 @@ RETRWEIRDO
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD blalbla

 CWD lululul

diff --git a/tests/data/test127 b/tests/data/test127
index 773f9630f..ac46d8d00 100644
--- a/tests/data/test127
+++ b/tests/data/test127
@@ -31,7 +31,7 @@ ftp://%HOSTIP:%FTPPORT/path/to/file/127 --disable-epsv
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 CWD to

diff --git a/tests/data/test128 b/tests/data/test128
index aca500b3b..743cd126f 100644
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -37,7 +37,7 @@ the
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test135 b/tests/data/test135
index 9a3d098d3..a051dba20 100644
--- a/tests/data/test135
+++ b/tests/data/test135
@@ -40,7 +40,7 @@ FTP retrieve a byte-range
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test137 b/tests/data/test137
index 816872fd2..75dbe6af7 100644
--- a/tests/data/test137
+++ b/tests/data/test137
@@ -26,7 +26,7 @@ RETRNOSIZE
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD blalbla

 CWD lululul

diff --git a/tests/data/test138 b/tests/data/test138
index 46b787213..6c8ecd5b2 100644
--- a/tests/data/test138
+++ b/tests/data/test138
@@ -29,7 +29,7 @@ RETRNOSIZE
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD blalbla

 CWD lululul

diff --git a/tests/data/test139 b/tests/data/test139
index 68cb8b250..dd677cd16 100644
--- a/tests/data/test139
+++ b/tests/data/test139
@@ -26,7 +26,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/139 -z "1 jan 1989"
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD blalbla

 MDTM 139

diff --git a/tests/data/test140 b/tests/data/test140
index a2be1ffa4..26a8c1cff 100644
--- a/tests/data/test140
+++ b/tests/data/test140
@@ -25,7 +25,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/140 -z "1 jan 2004"
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD blalbla

 MDTM 140

diff --git a/tests/data/test141 b/tests/data/test141
index f115b02ee..8530ee3c1 100644
--- a/tests/data/test141
+++ b/tests/data/test141
@@ -25,7 +25,7 @@ ftp://%HOSTIP:%FTPPORT/blalbla/141 -I
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD blalbla

 MDTM 141

diff --git a/tests/data/test142 b/tests/data/test142
index eb8583ffa..332d2005b 100644
--- a/tests/data/test142
+++ b/tests/data/test142
@@ -23,7 +23,7 @@ ftp://%HOSTIP:%FTPPORT/part1/part2/part3/part4/part5/part6/part7/part8/part9/par
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD part1

 CWD part2

diff --git a/tests/data/test143 b/tests/data/test143
index 237ee27ea..cf96b2186 100644
--- a/tests/data/test143
+++ b/tests/data/test143
@@ -23,7 +23,7 @@ FTP URL with type=a
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD /tmp

 CWD moo

diff --git a/tests/data/test144 b/tests/data/test144
index 3b03a7880..eec3b3731 100644
--- a/tests/data/test144
+++ b/tests/data/test144
@@ -31,7 +31,7 @@ REPLY NLST 450 No files found
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 PORT 127,0,0,1,243,212

 TYPE A

diff --git a/tests/data/test145 b/tests/data/test145
index b97bedf42..708c67264 100644
--- a/tests/data/test145
+++ b/tests/data/test145
@@ -34,7 +34,7 @@ REPLY NLST 550 Have a taste on this!
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 PORT 127,0,0,1,243,212

 TYPE A

diff --git a/tests/data/test146 b/tests/data/test146
index 94ff997ad..73895f29b 100644
--- a/tests/data/test146
+++ b/tests/data/test146
@@ -29,7 +29,7 @@ ftp://%HOSTIP:%FTPPORT/first/dir/here/146 ftp://%HOSTIP:%FTPPORT/146
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD first

 CWD dir

diff --git a/tests/data/test147 b/tests/data/test147
index 70bb76213..48a3e9fa0 100644
--- a/tests/data/test147
+++ b/tests/data/test147
@@ -33,7 +33,7 @@ COUNT CWD 1
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD first

 MKD first

diff --git a/tests/data/test148 b/tests/data/test148
index e89cc82d3..50a651d9c 100644
--- a/tests/data/test148
+++ b/tests/data/test148
@@ -33,7 +33,7 @@ REPLY MKD 550 We will have no such thing
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD attempt

 MKD attempt

diff --git a/tests/data/test149 b/tests/data/test149
index 5c21b3289..c50f134eb 100644
--- a/tests/data/test149
+++ b/tests/data/test149
@@ -29,7 +29,7 @@ send away this contents
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD dir1

 EPSV

diff --git a/tests/data/test161 b/tests/data/test161
index 7a7fb8cbe..bc6820ce1 100644
--- a/tests/data/test161
+++ b/tests/data/test161
@@ -27,7 +27,7 @@ ftp://%HOSTIP:%FTPPORT/161
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test182 b/tests/data/test182
index 0db14b3b8..272cdee2d 100644
--- a/tests/data/test182
+++ b/tests/data/test182
@@ -25,7 +25,7 @@ ftp://%HOSTIP:%FTPPORT/182
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test190 b/tests/data/test190
index b5c17850e..4ac85af4a 100644
--- a/tests/data/test190
+++ b/tests/data/test190
@@ -31,7 +31,7 @@ DELAY CWD 60
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 </protocol>
diff --git a/tests/data/test195 b/tests/data/test195
index f986bfb6e..556b08ee4 100644
--- a/tests/data/test195
+++ b/tests/data/test195
@@ -26,7 +26,7 @@ REPLY PASS 530 temporarily not available
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test196 b/tests/data/test196
index 6bc3dbd86..6c84bd818 100644
--- a/tests/data/test196
+++ b/tests/data/test196
@@ -27,9 +27,9 @@ REPLY PASS 530 temporarily not available
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 </protocol>
 </verify>
 </testcase>
diff --git a/tests/data/test210 b/tests/data/test210
index dd8c5c782..83c9b3e7b 100644
--- a/tests/data/test210
+++ b/tests/data/test210
@@ -29,7 +29,7 @@ data blobb
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD a

 CWD path

diff --git a/tests/data/test211 b/tests/data/test211
index 46c538aeb..72252a863 100644
--- a/tests/data/test211
+++ b/tests/data/test211
@@ -30,7 +30,7 @@ data blobb
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD a

 CWD path

diff --git a/tests/data/test212 b/tests/data/test212
index 943ae7a09..d745011d6 100644
--- a/tests/data/test212
+++ b/tests/data/test212
@@ -37,7 +37,7 @@ s/^(PORT 127,0,0,1,).*/$1/
 </strippart>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD a

 CWD path

diff --git a/tests/data/test215 b/tests/data/test215
index d44b2f367..500581789 100644
--- a/tests/data/test215
+++ b/tests/data/test215
@@ -36,7 +36,7 @@ ftp://%HOSTIP:%FTPPORT/a/path/215/ ftp://%HOSTIP:%FTPPORT/a/path/215/
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD a

 CWD path

diff --git a/tests/data/test216 b/tests/data/test216
index 2ed0925f3..a8264ce5b 100644
--- a/tests/data/test216
+++ b/tests/data/test216
@@ -23,7 +23,7 @@ upload this file twice
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD a

 CWD path

diff --git a/tests/data/test227 b/tests/data/test227
index 7ce25a60b..d6cac8d47 100644
--- a/tests/data/test227
+++ b/tests/data/test227
@@ -40,7 +40,7 @@ REPLY EPSV 500 no such command
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 NOOP 1

 EPSV

diff --git a/tests/data/test228 b/tests/data/test228
index 714f7cae6..0c4e0a069 100644
--- a/tests/data/test228
+++ b/tests/data/test228
@@ -40,7 +40,7 @@ REPLY ACCT 230 thank you
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 ACCT one count

 PWD

 EPSV

diff --git a/tests/data/test229 b/tests/data/test229
index 8b6af9602..f036f245c 100644
--- a/tests/data/test229
+++ b/tests/data/test229
@@ -32,7 +32,7 @@ REPLY ACCT 532 bluah!
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 ACCT one count

 </protocol>
 <errorcode>
diff --git a/tests/data/test235 b/tests/data/test235
index 699a478f9..b6981f76d 100644
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -27,7 +27,7 @@ worx?
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test236 b/tests/data/test236
index b25e898f8..b92c0a65d 100644
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -22,7 +22,7 @@ REPLY STOR 550 I said: access to this file is very much denied
 
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test237 b/tests/data/test237
index a1e105af7..7a020ab05 100644
--- a/tests/data/test237
+++ b/tests/data/test237
@@ -34,7 +34,7 @@ REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127)
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 PASV

 </protocol>
diff --git a/tests/data/test238 b/tests/data/test238
index 97050157f..6f2bad051 100644
--- a/tests/data/test238
+++ b/tests/data/test238
@@ -32,7 +32,7 @@ REPLY PASV 227 Entering Passiv Mode (1216,256,2,127,127,127)
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 PASV

diff --git a/tests/data/test247 b/tests/data/test247
index 3ed809d2e..66c674e98 100644
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -32,7 +32,7 @@ ftp://%HOSTIP:%FTPPORT/247 -T log/test247.txt -z "apr 1 2005 08:00:00"
 </upload>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 MDTM 247

 QUIT

diff --git a/tests/data/test248 b/tests/data/test248
index b2c3c4a36..814b1d714 100644
--- a/tests/data/test248
+++ b/tests/data/test248
@@ -38,7 +38,7 @@ works
 </upload>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 MDTM 248

 EPSV

diff --git a/tests/data/test250 b/tests/data/test250
index fc5ce0b02..a6d5d1cda 100644
--- a/tests/data/test250
+++ b/tests/data/test250
@@ -44,7 +44,7 @@ filter off really nothing
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE A

diff --git a/tests/data/test251 b/tests/data/test251
index 1afc12b35..84d2a995d 100644
--- a/tests/data/test251
+++ b/tests/data/test251
@@ -44,7 +44,7 @@ ftp://%HOSTIP:%FTPPORT/ -P %HOSTIP
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 PORT 127,0,0,1,243,212

 TYPE A

diff --git a/tests/data/test252 b/tests/data/test252
index 37769d92b..0cbe73fa5 100644
--- a/tests/data/test252
+++ b/tests/data/test252
@@ -50,7 +50,7 @@ filter off really nothing
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE A

diff --git a/tests/data/test253 b/tests/data/test253
index a1620dd73..7da721187 100644
--- a/tests/data/test253
+++ b/tests/data/test253
@@ -50,7 +50,7 @@ s/^(EPRT \|2\|::1\|)(.*)/$1/
 </strippart>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPRT |2|::1|
 TYPE A

diff --git a/tests/data/test254 b/tests/data/test254
index 416064731..b6227c7eb 100644
--- a/tests/data/test254
+++ b/tests/data/test254
@@ -51,7 +51,7 @@ filter off really nothing
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE A

diff --git a/tests/data/test255 b/tests/data/test255
index d26e82a7e..4bef23fa7 100644
--- a/tests/data/test255
+++ b/tests/data/test255
@@ -51,7 +51,7 @@ s/^(EPRT \|2\|::1\|)(.*)/$1/
 </strippart>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPRT |2|::1|
 TYPE A

diff --git a/tests/data/test261 b/tests/data/test261
index 79af663fd..896d032e2 100644
--- a/tests/data/test261
+++ b/tests/data/test261
@@ -39,7 +39,7 @@ filter off really nothing
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test270 b/tests/data/test270
index c6f1ea394..f4eea970e 100644
--- a/tests/data/test270
+++ b/tests/data/test270
@@ -38,7 +38,7 @@ ftp://%HOSTIP:%FTPPORT/270 --ftp-skip-pasv-ip --disable-epsv
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 PASV

 TYPE I

diff --git a/tests/data/test272 b/tests/data/test272
index d47f50c3c..f728a2a8c 100644
--- a/tests/data/test272
+++ b/tests/data/test272
@@ -31,7 +31,7 @@ ftp://%HOSTIP:%FTPPORT/272 -z "2004 jan 1 12:12:12 UTC"
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 MDTM 272

 QUIT

diff --git a/tests/data/test280 b/tests/data/test280
index 3bf2f953f..b1b057137 100644
--- a/tests/data/test280
+++ b/tests/data/test280
@@ -54,7 +54,7 @@ filter off really nothing
 <protocol>
 USER anonymous

 USER replacement

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD 280

 EPSV

diff --git a/tests/data/test505 b/tests/data/test505
index fa2ea20ca..d9e0fd297 100644
--- a/tests/data/test505
+++ b/tests/data/test505
@@ -47,7 +47,7 @@ works?
 </upload>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 EPSV

 TYPE I

diff --git a/tests/data/test511 b/tests/data/test511
index 65f9f1c67..f7f73b6c5 100644
--- a/tests/data/test511
+++ b/tests/data/test511
@@ -35,7 +35,7 @@ REPLY SIZE 550 bluah you f00l!
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 MDTM 511

 QUIT

diff --git a/tests/data/test520 b/tests/data/test520
index fe942bad4..ad2b8f5e6 100644
--- a/tests/data/test520
+++ b/tests/data/test520
@@ -34,7 +34,7 @@ REPLY MDTM 213 20030405060708
 
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 MDTM 520

 EPSV

diff --git a/tests/data/test524 b/tests/data/test524
index 98805f4f7..c60946672 100644
--- a/tests/data/test524
+++ b/tests/data/test524
@@ -34,7 +34,7 @@ ftp://%HOSTIP:%FTPPORT/path/to/
 <verify>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 </protocol>
 
diff --git a/tests/data/test525 b/tests/data/test525
index 0e3353d7b..598f54029 100644
--- a/tests/data/test525
+++ b/tests/data/test525
@@ -41,7 +41,7 @@ Moooooooooooo
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 PORT 127,0,0,1,5,109

diff --git a/tests/data/test526 b/tests/data/test526
index 5d45b5c20..1cd3e6a73 100644
--- a/tests/data/test526
+++ b/tests/data/test526
@@ -41,7 +41,7 @@ ftp://%HOSTIP:%FTPPORT/path/526
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 EPSV

diff --git a/tests/data/test527 b/tests/data/test527
index 2a6df836a..ed89a4553 100644
--- a/tests/data/test527
+++ b/tests/data/test527
@@ -41,7 +41,7 @@ ftp://%HOSTIP:%FTPPORT/path/527
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 EPSV

diff --git a/tests/data/test529 b/tests/data/test529
index 36643ff95..1374c1642 100644
--- a/tests/data/test529
+++ b/tests/data/test529
@@ -41,7 +41,7 @@ Moooooooooooo
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 PORT 127,0,0,1,5,109

diff --git a/tests/data/test531 b/tests/data/test531
index 8e577c981..48807f03d 100644
--- a/tests/data/test531
+++ b/tests/data/test531
@@ -44,7 +44,7 @@ don't upload this
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 PORT 127,0,0,1,5,109

diff --git a/tests/data/test532 b/tests/data/test532
index 5a509ef3d..d80a53ae4 100644
--- a/tests/data/test532
+++ b/tests/data/test532
@@ -41,7 +41,7 @@ ftp://%HOSTIP:%FTPPORT/path/532
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 EPSV

diff --git a/tests/data/test533 b/tests/data/test533
index 58db1950f..1d62dc6bb 100644
--- a/tests/data/test533
+++ b/tests/data/test533
@@ -39,7 +39,7 @@ ftp://%HOSTIP:%FTPPORT/path/533 ftp://%HOSTIP:%FTPPORT/path/533
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 EPSV

diff --git a/tests/data/test534 b/tests/data/test534
index 19755377c..06875f50f 100644
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -39,7 +39,7 @@ ftp://non-existing-host.com/path/534 ftp://%HOSTIP:%FTPPORT/path/534
 </strip>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 PWD

 CWD path

 EPSV

diff --git a/tests/data/test538 b/tests/data/test538
index 24d960325..e97b69df4 100644
--- a/tests/data/test538
+++ b/tests/data/test538
@@ -38,7 +38,7 @@ REPLY PASS 314 bluah you f00l!
 </errorcode>
 <protocol>
 USER anonymous

-PASS curl_by_daniel@haxx.se

+PASS ftp@example.com

 </protocol>
 </verify>
 </testcase>