From 4ba3b6c05a33b8b4fb7a74b8286022d24be7aa25 Mon Sep 17 00:00:00 2001
From: Steve Holme <steve_holme@hotmail.com>
Date: Sun, 15 Sep 2013 00:31:55 +0100
Subject: ftpserver.pl: Corrected invalid user details check

...in both the IMAP LOGIN and POP3 PASS handlers introduced in commit
187ac693744949 and 84ad1569e5fc93 respectively.
---
 tests/ftpserver.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index d26a76cf1..3fffcd7a6 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -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 {
-- 
cgit v1.2.3