[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squirrelmail-cvs
Subject:    [SM-CVS] SF.net SVN: squirrelmail:[14077]
From:       pdontthink () users ! sourceforge ! net
Date:       2010-11-26 21:31:06
Message-ID: E1PM5so-0005eG-Fl () sfp-svn-1 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 14077
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14077&view=rev
Author:   pdontthink
Date:     2010-11-26 21:31:06 +0000 (Fri, 26 Nov 2010)

Log Message:
-----------
SMTP SASL plain authentication has long been an option in the code, but never made \
its way into the config tool

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/config/conf.pl
    branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog

Modified: branches/SM-1_4-STABLE/squirrelmail/config/conf.pl
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/config/conf.pl	2010-11-26 10:02:51 UTC (rev \
                14076)
+++ branches/SM-1_4-STABLE/squirrelmail/config/conf.pl	2010-11-26 21:31:06 UTC (rev \
14077) @@ -1295,7 +1295,7 @@
 
     
 # SMTP authentication type
-# Possible choices: none, plain, cram-md5, digest-md5
+# Possible choices: none, login, plain, cram-md5, digest-md5
 sub command112b {
     if ($use_smtp_tls =~ /^true\b/i) {
         print "Auto-detection of login methods is unavailable when using TLS.\n";
@@ -1347,6 +1347,19 @@
               } else {
                   print $WHT . "ERROR DETECTING$NRM\n";
               }
+
+            # Try plain
+            print "Testing plain:\t\t";
+            $tmp=detect_auth_support('SMTP',$host,'PLAIN');
+            if (defined($tmp)) {
+                if ($tmp eq 'YES') {
+                    print $WHT . "SUPPORTED$NRM\n";
+                } else {
+                    print $WHT . "NOT SUPPORTED$NRM\n";
+                }
+              } else {
+                  print $WHT . "ERROR DETECTING$NRM\n";
+              }
     
             # Try CRAM-MD5
             print "Testing CRAM-MD5:\t";
@@ -1378,11 +1391,12 @@
     print "\nWhat authentication mechanism do you want to use for SMTP \
                connections?\n";
     print $WHT . "none" . $NRM . " - Your SMTP server does not require \
                authorization.\n";
     print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably \
should.\n"; +    print $WHT . "plain" . $NRM . " - Plaintext. If you can do better, \
                you probably should.\n";
     print $WHT . "cram-md5" . $NRM . " - Slightly better than plaintext.\n";
     print $WHT . "digest-md5" . $NRM . " - Privacy protection - better than \
                cram-md5.\n";
     print $WHT . "\n*** YOUR SMTP SERVER MUST SUPPORT THE MECHANISM YOU CHOOSE HERE \
                ***\n" . $NRM;
     print "If you don't understand or are unsure, you probably want \"none\"\n\n";
-    print "none, login, cram-md5, or digest-md5 [$WHT$smtp_auth_mech$NRM]: $WHT";
+    print "none, login, plain, cram-md5, or digest-md5 [$WHT$smtp_auth_mech$NRM]: \
$WHT";  $inval=<STDIN>;
     chomp($inval);
     if ($inval =~ /^none\b/i) {
@@ -1392,7 +1406,7 @@
       return "none";
     }
     if ( ($inval =~ /^cram-md5\b/i) || ($inval =~ /^digest-md5\b/i) || 
-    ($inval =~ /^login\b/i)) {
+    ($inval =~ /^login\b/i) || ($inval =~ /^plain\b/i)) {
       command_smtp_sitewide_userpass($inval);
       return lc($inval);
     } elsif (trim($inval) eq '') {

Modified: branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog	2010-11-26 10:02:51 UTC (rev \
                14076)
+++ branches/SM-1_4-STABLE/squirrelmail/doc/ChangeLog	2010-11-26 21:31:06 UTC (rev \
14077) @@ -20,6 +20,8 @@
   - Backport fix for call_user_func_array not supporting NULL as empty
     array in PHP 5.3.3
   - Fixed sqauth_read_password() for plugins on the login_verified hook.
+  - Added SMTP SASL PLAIN authentication option to configuration tool
+    (core support for such is not new).
 
 Version 1.4.21 - 23 Jul 2010
 ----------------------------


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@lists.sourceforge.net
List info (subscribe/unsubscribe/change options): \
                https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn


[prev in list] [next in list] [prev in thread] [next in thread]