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

List:       squirrelmail-cvs
Subject:    [SM-CVS] CVS: squirrelmail/config conf.pl,1.164,1.165
From:       Chris Hilts <tassium () users ! sourceforge ! net>
Date:       2003-09-29 21:11:36
[Download RAW message or body]

Update of /cvsroot/squirrelmail/squirrelmail/config
In directory sc8-pr-cvs1:/tmp/cvs-serv15881/config

Modified Files:
	conf.pl 
Log Message:
conf.pl no longer offers to detect auth methods if TLS is enabled.


Index: conf.pl
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/config/conf.pl,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -w -r1.164 -r1.165
--- conf.pl	24 Sep 2003 13:48:00 -0000	1.164
+++ conf.pl	29 Sep 2003 21:11:34 -0000	1.165
@@ -1135,6 +1135,9 @@
 # Now offers to detect supported mechs, assuming server & port are set correctly
 
 sub command112a {
+    if ($use_imap_tls =~ /^true\b/i) {
+        print "Auto-detection of login methods is unavailable when using TLS.\n";
+    } else {
 	print "If you have already set the hostname and port number, I can try to\n";
 	print "detect the mechanisms your IMAP server supports.\n";
 	print "I will try to detect CRAM-MD5 and DIGEST-MD5 support.  I can't test\n";
@@ -1172,6 +1175,7 @@
 	  }
 	  
 	} 
+    } 
 	  print "\nWhat authentication mechanism do you want to use for IMAP connections?\n\n";
 	  print $WHT . "login" . $NRM . " - Plaintext. If you can do better, you probably should.\n";
       print $WHT . "plain" . $NRM . " - SASL PLAIN. If you need this, you already know it.\n";
@@ -1194,6 +1198,9 @@
 # SMTP authentication type
 # Possible choices: none, 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";
+    } else {
     print "If you have already set the hostname and port number, I can try to\n";
     print "automatically detect some of the mechanisms your SMTP server supports.\n";
 	print "Auto-detection is *optional* - you can safely say \"n\" here.\n";
@@ -1266,7 +1273,8 @@
               print $WHT . "ERROR DETECTING$NRM\n";
         }
     } 
-    print "\tWhat authentication mechanism do you want to use for SMTP connections?\n";
+    }
+    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 . " - SASL PLAIN.  You already know it if you need this.\n";



-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
--
squirrelmail-cvs mailing list
List Address: squirrelmail-cvs@lists.sourceforge.net
List Info: https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
http://squirrelmail.org/cvs
[prev in list] [next in list] [prev in thread] [next in thread]