]> granicus.if.org Git - curl/commitdiff
ftpserver.pl: Updated custom full text REPLY regex
authorSteve Holme <steve_holme@hotmail.com>
Mon, 23 Dec 2013 12:20:32 +0000 (12:20 +0000)
committerSteve Holme <steve_holme@hotmail.com>
Mon, 23 Dec 2013 12:24:06 +0000 (12:24 +0000)
SASL downgrade tests: 833, 835, 879, 881, 935 and 937 would fail as
they contained a minus sign in their authentication mechanism and this
would be missed by the custom reply parser.

tests/ftpserver.pl

index a37802d5c063fca12ad43d057677975e19917d17..5303cd7b04966fcf6256a1859d9c063e9c7c7d89 100755 (executable)
@@ -2843,7 +2843,7 @@ sub customize {
     logmsg "FTPD: Getting commands from log/ftpserver.cmd\n";
 
     while(<CUSTOM>) {
-        if($_ =~ /REPLY \"([A-Z]+ [A-Za-z0-9+\/=\*]+)\" (.*)/) {
+        if($_ =~ /REPLY \"([A-Z]+ [A-Za-z0-9+-\/=\*]+)\" (.*)/) {
             $fulltextreply{$1}=eval "qq{$2}";
             logmsg "FTPD: set custom reply for $1\n";
         }