* Sun Oct 31 2010 Shad L. Lords <[email protected]> 5.2.0-12.sme

- Add smtp auth into web interface, not just when enabled [SME: 6318]

Author: Shad L. Lords

e-smith-email-5.2.0-smtp-auth.patch

@@ -0,0 +1,38 @@
+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
+--- 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
++++ 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
+@@ -229,7 +229,7 @@ sub change_settings_reception
+         }
+     }
+ 
+-    my $smtpAuth = ($q->param('SMTPAuth') || 'disabled');
++    my $smtpAuth = ($q->param('SMTPAuth') || 'public');
+     if ($smtpAuth eq 'public') {
+         $db->set_prop("smtpd", "Authentication", "enabled" );
+         $db->set_prop("ssmtpd", "Authentication", "enabled" );
+@@ -521,10 +521,10 @@ sub get_current_smtp_auth {
+     my ($fm, $localise) = @_;
+ 
+     my $smtpStatus = $db->get_prop('smtpd', 'status') || 'enabled';
+-    my $smtpAuth = $db->get_prop('smtpd', 'Authentication') || 'disabled';
++    my $smtpAuth = $db->get_prop('smtpd', 'Authentication') || 'enabled';
+ 
+     my $smtpsStatus = $db->get_prop('ssmtpd', 'status') || 'enabled';
+-    my $smtpsAuth = $db->get_prop('ssmtpd', 'Authentication') || 'disabled';
++    my $smtpsAuth = $db->get_prop('ssmtpd', 'Authentication') || 'enabled';
+ 
+     my $options = get_smtp_auth_options();
+ 
+@@ -696,11 +696,7 @@ sub get_patterns_current_options
+ 
+ sub get_smtp_auth_options
+ {
+-    my %options = ( disabled => 'DISABLED', publicSSL  => 'SECURE_SMTP' );
+-
+-    my $cleartext = $db->get_prop('smtpd', 'Authentication') || 'disabled';
+-
+-    $options{public} = 'INSECURE_SMTP' if ($cleartext eq 'enabled');
++    my %options = ( disabled => 'DISABLED', publicSSL  => 'SECURE_SMTP', public => 'INSECURE_SMTP');
+ 
+     \%options;
+ }

e-smith-email.spec

@@ -1,10 +1,10 @@
-# $Id: e-smith-email.spec,v 1.27 2010/10/04 16:40:39 slords Exp $
+# $Id: e-smith-email.spec,v 1.28 2010/10/31 18:49:40 slords Exp $
 
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
 %define version 5.2.0
-%define release 11
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,6 +18,7 @@ Patch5: e-smith-email-5.2.0-HeloHost.patch2
 Patch6: e-smith-email-5.2.0-zero-to-disabled.patch
 Patch7: e-smith-email-5.2.0-transparent.patch
 Patch8: e-smith-email-5.2.0-force_relay.patch
+Patch9: e-smith-email-5.2.0-smtp-auth.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -43,6 +44,9 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Sun Oct 31 2010 Shad L. Lords <[email protected]> 5.2.0-12.sme
+- Add smtp auth into web interface, not just when enabled [SME: 6318]
+
 * Mon Oct 4 2010 Shad L. Lords <[email protected]> 5.2.0-11.sme
 - Enable auth for smtp traffic and migrate if necessary [SME: 5575]
 
@@ -1367,6 +1371,7 @@ e-smith server and gateway software - email module.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 perl createlinks