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

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;
 }
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	}