Fixed #1727033 (auth support detection in conf.pl)

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12424 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 27eb5a5cadc870c7ce9fc36be9aa78274d9d7436..654e4e2d056005bf5c6f371d4be61de53f9312ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 
 Version 1.5.2 - SVN
 -------------------
+  - Fixed #1727033 (incorrect detection of auth mechanisms in config.pl)
   - The search expression in the LDAP backend of the Addressbook is now
     configurable, which can allow the result set to be expanded.
   - Preliminary support for NAMESPACE in Squirrelmail IMAP Backend: NAMESPACE

diff --git a/config/conf.pl b/config/conf.pl
index f936c3f516338a461f1ad06b61e9fbacc68ef66d..1588e9d7e1aaef8370e5448ee324ff1805d6980c 100755 (executable)
--- a/config/conf.pl
+++ b/config/conf.pl
@@ -1443,6 +1443,7 @@ sub command112b {
                 print " ERROR TESTING\n";
                 close $sock;
             } else {
+                $got = <$sock>;  # Discard greeting
                 print $sock "HELO $domain\r\n";
                 $got = <$sock>;  # Discard
                 print $sock "MAIL FROM:<tester\@squirrelmail.org>\r\n";
@@ -5048,14 +5049,11 @@ sub detect_auth_support {
 
     # So at this point, we have a response, and it is (hopefully) valid.
     if ($service eq 'SMTP') {
-        if (($response =~ /^535/) or ($response =~/^502/)) {
+        if (!($response =~ /^334/)) {
             # Not supported
             print $sock $logout;
             close $sock;
             return 'NO';
-        } elsif ($response =~ /^503/) {
-            #Something went wrong
-            return undef;
         }
     } elsif ($service eq 'IMAP') {
         if ($response =~ /^A01/) {