Commit 4ba3b6c0 authored by Steve Holme's avatar Steve Holme
Browse files

ftpserver.pl: Corrected invalid user details check 

...in both the IMAP LOGIN and POP3 PASS handlers introduced in commit
187ac693 and 84ad1569 respectively.
parent 187ac693

tests/ftpserver.pl

+2 −2
Original line number Diff line number Diff line
@@ -833,7 +833,7 @@ sub LOGIN_imap { 
    if ($user eq "") {

        sendcontrol "$cmdid BAD Command Argument\r\n";

    }

    elsif (($user ne $TEXT_USERNAME) && ($password ne $TEXT_PASSWORD)) {

    elsif (($user ne $TEXT_USERNAME) || ($password ne $TEXT_PASSWORD)) {

        sendcontrol "$cmdid NO LOGIN failed\r\n";

    }

    else {
@@ -1489,7 +1489,7 @@ sub PASS_pop3 { 


    logmsg "PASS_pop3 got $password\n";



    if (($username ne $TEXT_USERNAME) && ($password ne $TEXT_PASSWORD)) {

    if (($username ne $TEXT_USERNAME) || ($password ne $TEXT_PASSWORD)) {

        sendcontrol "-ERR Login failure\r\n";

    }

    else {