/[smeserver]/rpms/e-smith-email/sme9/e-smith-email-5.4.0-AuthException.patch
ViewVC logotype

Contents of /rpms/e-smith-email/sme9/e-smith-email-5.4.0-AuthException.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (show annotations) (download)
Tue Feb 11 02:49:02 2014 UTC (10 years, 8 months ago) by wellsi
Branch: MAIN
CVS Tags: e-smith-email-5_4_0-11_el6_sme, e-smith-email-5_4_0-10_el6_sme, e-smith-email-5_4_0-12_el6_sme, e-smith-email-5_4_0-9_el6_sme, e-smith-email-5_4_0-8_el6_sme, HEAD
* Mon Feb 10 2014 Charlie Brady <charlie_brady@mitel.com> 5.4.0-8.sme
- Handle exceptions during attempted SASL auth. Add more debug tracing.
  [SME: 8202]

* Fri Dec 20 2013 Ian Wells <esmith@wellsi.com> 5.4.0-7.sme
- Update of allow webmail-only-local-network by Stephane de Labrusse [SME: 7351]

1 diff -ru e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl e-smith-email-5.2.0.new/root/usr/local/sbin/smtp-auth-proxy.pl
2 --- e-smith-email-5.2.0/root/usr/local/sbin/smtp-auth-proxy.pl 2014-02-10 17:10:03.672061000 -0500
3 +++ e-smith-email-5.2.0.new/root/usr/local/sbin/smtp-auth-proxy.pl 2014-02-10 16:27:52.198641000 -0500
4 @@ -119,19 +119,24 @@
5 foreach my $method (split (/ /, ${*$smtp}{'net_smtp_esmtp'}->{"AUTH"}))
6 {
7 # Skip $method if in the blacklist
8 - next unless ($blacklist !~ /$method/);
9 + if ($blacklist =~ /$method/)
10 + {
11 + warn "Skipping blacklisted method $method\n" if $debug;
12 + next;
13 + }
14 + warn "Trying authentication method $method\n" if $debug;
15 # Only present one auth method at a time to NET::SMTP
16 {${*$smtp}{'net_smtp_esmtp'}->{"AUTH"} = $method;}
17
18 - if ($smtp->auth($name, $pass))
19 - {
20 - $authenticated++;
21 - last;
22 - }
23 - else
24 - {
25 - warn "SMTP authentication (with $method) with ISP server failed\n";
26 - }
27 + eval { $authenticated = $smtp->auth($name, $pass); };
28 +
29 + if ($@)
30 + {
31 + warn "exception during authentication (with $method): $@\n";
32 + next;
33 + }
34 + last if $authenticated;
35 + warn "SMTP authentication (with $method) with ISP server failed\n";
36 }
37 unless ($authenticated)
38 {

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed