/[smeserver]/rpms/e-smith-email/sme8/e-smith-email-5.2.0-smtp-auth.patch
ViewVC logotype

Contents of /rpms/e-smith-email/sme8/e-smith-email-5.2.0-smtp-auth.patch

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


Revision 1.1 - (show annotations) (download)
Sun Oct 31 18:49:40 2010 UTC (14 years ago) by slords
Branch: MAIN
CVS Tags: e-smith-email-5_2_0-24_el5_sme, e-smith-email-5_2_0-19_el5_sme, e-smith-email-5_2_0-17_el5_sme, e-smith-email-5_2_0-12_el5_sme, e-smith-email-5_2_0-20_el5_sme, e-smith-email-5_2_0-16_el5_sme, e-smith-email-5_2_0-21_el5_sme, e-smith-email-5_2_0-22_el5_sme, e-smith-email-5_2_0-27_el5_sme, e-smith-email-5_2_0-13_el5_sme, e-smith-email-5_2_0-23_el5_sme, e-smith-email-5_2_0-25_el5_sme, e-smith-email-5_2_0-26_el5_sme, e-smith-email-5_2_0-14_el5_sme, e-smith-email-5_2_0-15_el5_sme, e-smith-email-5_2_0-28_el5_sme, e-smith-email-5_2_0-18_el5_sme, HEAD
* Sun Oct 31 2010 Shad L. Lords <slords@mail.com> 5.2.0-12.sme
- Add smtp auth into web interface, not just when enabled [SME: 6318]

1 diff -up e-smith-email-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm.smtp-auth e-smith-email-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm
2 --- e-smith-email-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm.smtp-auth 2010-10-31 12:39:36.000000000 -0600
3 +++ e-smith-email-5.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/emailsettings.pm 2010-10-31 12:47:06.000000000 -0600
4 @@ -229,7 +229,7 @@ sub change_settings_reception
5 }
6 }
7
8 - my $smtpAuth = ($q->param('SMTPAuth') || 'disabled');
9 + my $smtpAuth = ($q->param('SMTPAuth') || 'public');
10 if ($smtpAuth eq 'public') {
11 $db->set_prop("smtpd", "Authentication", "enabled" );
12 $db->set_prop("ssmtpd", "Authentication", "enabled" );
13 @@ -521,10 +521,10 @@ sub get_current_smtp_auth {
14 my ($fm, $localise) = @_;
15
16 my $smtpStatus = $db->get_prop('smtpd', 'status') || 'enabled';
17 - my $smtpAuth = $db->get_prop('smtpd', 'Authentication') || 'disabled';
18 + my $smtpAuth = $db->get_prop('smtpd', 'Authentication') || 'enabled';
19
20 my $smtpsStatus = $db->get_prop('ssmtpd', 'status') || 'enabled';
21 - my $smtpsAuth = $db->get_prop('ssmtpd', 'Authentication') || 'disabled';
22 + my $smtpsAuth = $db->get_prop('ssmtpd', 'Authentication') || 'enabled';
23
24 my $options = get_smtp_auth_options();
25
26 @@ -696,11 +696,7 @@ sub get_patterns_current_options
27
28 sub get_smtp_auth_options
29 {
30 - my %options = ( disabled => 'DISABLED', publicSSL => 'SECURE_SMTP' );
31 -
32 - my $cleartext = $db->get_prop('smtpd', 'Authentication') || 'disabled';
33 -
34 - $options{public} = 'INSECURE_SMTP' if ($cleartext eq 'enabled');
35 + my %options = ( disabled => 'DISABLED', publicSSL => 'SECURE_SMTP', public => 'INSECURE_SMTP');
36
37 \%options;
38 }

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