Author: varkoly
Date: Tue Jan 29 17:27:28 2008
New Revision: 43980
URL: http://svn.opensuse.org/viewcvs/yast?rev=43980&view=rev
Log:
make this branch = trunk
Modified:
branches/SuSE-Linux-10_3-Branch/mail/agents/CyrusConfParser.pm
branches/SuSE-Linux-10_3-Branch/mail/agents/MasterCFParser.pm
branches/SuSE-Linux-10_3-Branch/mail/agents/sysconfig.mail
branches/SuSE-Linux-10_3-Branch/mail/package/yast2-mail.changes
branches/SuSE-Linux-10_3-Branch/mail/src/MailServer.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm
branches/SuSE-Linux-10_3-Branch/mail/src/YaPI/MailServer.pm
branches/SuSE-Linux-10_3-Branch/mail/src/helps.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/mail-advanced.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_complex.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_dialogs.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_wizards.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/mail.ycp
branches/SuSE-Linux-10_3-Branch/mail/src/suse-mailserver.schema
branches/SuSE-Linux-10_3-Branch/mail/src/widgets.ycp
branches/SuSE-Linux-10_3-Branch/mail/yast2-mail.spec.in
Modified: branches/SuSE-Linux-10_3-Branch/mail/agents/CyrusConfParser.pm
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/agents/CyrusConfParser.pm?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/agents/CyrusConfParser.pm (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/agents/CyrusConfParser.pm Tue Jan 29 17:27:28 2008
@@ -1,3 +1,4 @@
+#!/usr/bin/perl
#
# $Id: CyrusConfParser.pm 23262 2005-05-03 11:30:49Z choeger $
#
Modified: branches/SuSE-Linux-10_3-Branch/mail/agents/MasterCFParser.pm
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/agents/MasterCFParser.pm?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/agents/MasterCFParser.pm (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/agents/MasterCFParser.pm Tue Jan 29 17:27:28 2008
@@ -1,3 +1,4 @@
+#!/usr/bin/perl
#
# $Id: MasterCFParser.pm 30394 2006-04-24 10:12:22Z varkoly $
#
Modified: branches/SuSE-Linux-10_3-Branch/mail/agents/sysconfig.mail
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/agents/sysconfig.mail?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/agents/sysconfig.mail (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/agents/sysconfig.mail Tue Jan 29 17:27:28 2008
@@ -46,4 +46,4 @@
#
# This variable contains the type of the mail server configuration.
#
-CONF_TYPE="undef"
+CONFIG_TYPE="undef"
Modified: branches/SuSE-Linux-10_3-Branch/mail/package/yast2-mail.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/package/yast2-mail.changes?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/package/yast2-mail.changes (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/package/yast2-mail.changes Tue Jan 29 17:27:28 2008
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Thu Jan 24 15:36:49 CET 2008 - mzugec@suse.de
+
+- replace deprecated NetworkDevices by NetworkInterfaces (from yast2)
+- 2.16.0
+
+-------------------------------------------------------------------
+Sun Dec 30 19:29:49 CET 2007 - pv@suse.de
+
+- #278535 - YaST2 mail dialog does not offer help on the "No connection" setting
+- bugfix: it was not possible to connect to an existen LDAP-server during
+ the configuration
+- bugfix: check if bind-utils is installed. We need the dnsZone.schema
+ file
+- #337398 - Long time bug in yast mail transfer agent module regarding
+ relayhost port setting
+- #335524 Advanced Mail Transfer Agent cannot access LDAP server
+- fixing the return values of wizard elements
+- 2.15.24
+
+-------------------------------------------------------------------
Mon Sep 24 16:54:32 CEST 2007 - pv@suse.de
- #327550 - yast2-mail fetchmail error
Modified: branches/SuSE-Linux-10_3-Branch/mail/src/MailServer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/MailServer.ycp?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/src/MailServer.ycp (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/src/MailServer.ycp Tue Jan 29 17:27:28 2008
@@ -159,6 +159,8 @@
return Package::Installed (package);
}
+global boolean pam_ldap_installed = false;
+global boolean nss_ldap_installed = false;
global boolean procmail_installed = false;
global boolean amavis_installed = false;
global boolean ldap_installed = false;
@@ -216,7 +218,7 @@
if(! is_main_domain )
{
y2milestone("no main mail domain");
- LDAPSettings["bind_pw"] = MailServer::AdminPassword;
+ LDAPSettings["bind_pw"] = AdminPassword;
SCR::Execute (.ldap.bind,LDAPSettings);
integer counter = 0;
map lastDomain = $[];
@@ -258,6 +260,8 @@
*/
global boolean CheckPackages()
{
+ pam_ldap_installed = Installed("pam_ldap");
+ nss_ldap_installed = Installed("nss_ldap");
procmail_installed = Installed("procmail");
cyrus_installed = Installed("cyrus-imapd");
postfix_installed = Installed("postfix");
@@ -269,16 +273,26 @@
string to_install = "";
list<string> l_to_install = [];
- if (!ldap_installed)
+ if (!pam_ldap_installed)
{
- l_to_install = add( l_to_install, "yast2-ldap-client" );
- to_install = to_install + "yast2-ldap-client\n";
+ l_to_install = add( l_to_install, "pam_ldap" );
+ to_install = to_install + "pam_ldap\n";
+ }
+ if (!nss_ldap_installed)
+ {
+ l_to_install = add( l_to_install, "nss_ldap" );
+ to_install = to_install + "nss_ldap\n";
}
if (!postfix_installed)
{
l_to_install = add( l_to_install, "postfix" );
to_install = to_install + "postfix\n";
}
+ if (!ldap_installed)
+ {
+ l_to_install = add( l_to_install, "yast2-ldap-client" );
+ to_install = to_install + "yast2-ldap-client\n";
+ }
if(!sasl_installed)
{
l_to_install = add( l_to_install, "cyrus-sasl-plain" );
@@ -546,8 +560,9 @@
`focus_yes))
{
Package::DoInstall(["clamav","amavisd-new"]);
- Service::Start("amavis");
Service::Start("clamd");
+ Service::Start("freshclam");
+ Service::Start("amavis");
y2milestone("Installing amavis");
}
else
@@ -557,6 +572,7 @@
}
Service::Enable("amavis");
Service::Enable("clamd");
+ Service::Enable("freshclam");
}
if( (boolean)MailPrevention["Changed"]:false ) {
if( ! YaPI::MailServer::WriteMailPrevention(MailPrevention,AdminPassword) ) {
@@ -564,6 +580,7 @@
}
if((boolean)MailPrevention["VirusScanning"]:false) {
Service::Restart("clamd");
+ Service::Restart("freshclam");
Service::Restart("amavis");
}
}
Modified: branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm Tue Jan 29 17:27:28 2008
@@ -34,7 +34,7 @@
YaST::YCP::Import ("YaPI::LdapServer");
YaST::YCP::Import ("Service");
-BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", "any", [ "map","string","any"]];}
+BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", "any"];}
sub ConfigureLDAPServer()
{
# don't configure if using eDirectory server
@@ -87,7 +87,7 @@
"param" => "eq" }
);
}
- if(!$SuSEMailClient)
+ if(!$suseTLSPerSitePeer)
{
YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain},
{ "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination",
Modified: branches/SuSE-Linux-10_3-Branch/mail/src/YaPI/MailServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/YaPI/MailServer.pm?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/src/YaPI/MailServer.pm (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/src/YaPI/MailServer.pm Tue Jan 29 17:27:28 2008
@@ -48,7 +48,7 @@
YaST::YCP::Import ("SCR");
YaST::YCP::Import ("Service");
YaST::YCP::Import ("Ldap");
-YaST::YCP::Import ("NetworkDevices");
+YaST::YCP::Import ("NetworkInterfaces");
##
#
@@ -423,6 +423,71 @@
}
=item *
+C<$Canonical = ReadCanonical($AdminPassword)>
+
+ Dump the mail-server Mail Transport to a single hash
+ @return hash Dumped settings (later acceptable by WriteCanonical ())
+
+=cut
+
+BEGIN { $TYPEINFO{ReadCanonical} =["function", ["map", "string", "any"] , "string"]; }
+sub ReadCanonical
+{
+ my $self = shift;
+ my $AdminPassword = shift;
+
+
+ my %Canonicals = (
+ 'Changed' => YaST::YCP::Boolean(0),
+ 'CanonicalTable' => [],
+ 'CanonicalClasses' => []
+ );
+
+
+ # Make LDAP Connection
+ my $ldapMap = $self->ReadLDAPDefaults($AdminPassword);
+ if( !$ldapMap )
+ {
+ return undef;
+ }
+ my $MainCf = SCR->Read('.mail.postfix.main.table');
+ my $CanonicalClasses = read_attribute($MainCf,'transport_maps');
+ $CanonicalClasses =~ s/ //g;
+ push @{$Canonicals{CanonicalClasses}}, split /,/,$CanonicalClasses;
+
+ my %SearchMap = (
+ 'base_dn' => $ldapMap->{'mail_config_dn'},
+ 'filter' => "ObjectClass=suseCanonicalTable",
+ 'scope' => 2,
+ 'map' => 1,
+ 'attributes' => ['tableKey',
+ 'tableValue',
+ 'valueType',
+ 'description' ]
+ );
+
+
+ # Searching all the transport lists
+ my $ret = SCR->Read('.ldap.search',\%SearchMap);
+
+ # filling up our array
+ foreach my $dn (keys %{$ret})
+ {
+ my $Canonical = {};
+ $Canonical->{'key'} = $ret->{$dn}->{'tablekey'}->[0];
+ $Canonical->{'value'} = $ret->{$dn}->{'tablevalue'}->[0];
+ $Canonical->{'type'} = $ret->{$dn}->{'valuetype'}->[0];
+ if( defined $ret->{$dn}->{'description'}->[0] )
+ {
+ $Canonical->{'description'} = $ret->{$dn}->{'description'}->[0];
+ }
+ push @{$Canonicals{'CanonicalTable'}}, $Canonical;
+ }
+ #now we return the result
+ return \%Canonicals;
+}
+
+=item *
C<$MailTransports = ReadMailTransports($AdminPassword)>
Dump the mail-server Mail Transport to a single hash
@@ -1959,16 +2024,16 @@
#print STDERR Dumper([$FetchingMail]);
if($FetchingMail->{'Interface'} ne '')
{
- NetworkDevices->Read();
+ NetworkInterfaces->Read();
if($FetchingMail->{'FetchByDialIn'})
{
- NetworkDevices->SetValue($FetchingMail->{'Interface'},'RUN_POLL_TCPIP','yes');
+ NetworkInterfaces->SetValue($FetchingMail->{'Interface'},'RUN_POLL_TCPIP','yes');
}
else
{
- NetworkDevices->SetValue($FetchingMail->{'Interface'},'RUN_POLL_TCPIP','no');
+ NetworkInterfaces->SetValue($FetchingMail->{'Interface'},'RUN_POLL_TCPIP','no');
}
- NetworkDevices->Write('ppp|ipp|dsl');
+ NetworkInterfaces->Write('ppp|ipp|dsl');
}
if($FetchingMail->{'FetchMailSteady'})
{
@@ -2669,6 +2734,8 @@
write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf');
write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_maps.cf');
write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps.cf, ldap:/etc/postfix/ldapalias_maps_member.cf');
+ check_ldap_configuration('transport_maps',$ldapMap);
+ check_ldap_configuration('smtp_tls_per_site',$ldapMap);
check_ldap_configuration('masquerade_domains',$ldapMap);
check_ldap_configuration('mydestination',$ldapMap);
check_ldap_configuration('local_recipient_maps',$ldapMap);
@@ -2809,7 +2876,10 @@
'mynetworks' => '(&(objectclass=suseMailMyNetworks)(suseMailClient=%s))',
'masquerade_domains' => '(&(objectclass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))',
'mydestination' => '(&(objectclass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))',
- 'virtual_alias_maps' => '(&(objectclass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))'
+ 'virtual_alias_maps' => '(&(objectclass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(suseMailDomainType=virtual))',
+ 'canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=both))',
+ 'recipient_canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=recipient))',
+ 'sender_canonical_maps' => '(&(objectclass=suseCanonicalTable)(tableKey=%s)(valueType=sender))'
);
my %result_attribute = (
'transport_maps' => 'suseMailTransportNexthop',
@@ -2821,7 +2891,10 @@
'mynetworks' => 'suseMailClient',
'masquerade_domains' => 'zoneName',
'mydestination' => 'zoneName',
- 'virtual_alias_maps' => 'zoneName'
+ 'virtual_alias_maps' => 'zoneName',
+ 'canonical_maps' => 'tableValue',
+ 'recipient_canonical_maps' => 'tableValue',
+ 'sender_canonical_maps' => 'tableValue'
);
my %scope = (
'transport_maps' => 'one',
@@ -2833,7 +2906,10 @@
'mynetworks' => 'one',
'masquerade_domains' => 'sub',
'mydestination' => 'sub',
- 'virtual_alias_maps' => 'sub'
+ 'virtual_alias_maps' => 'sub',
+ 'canonical_maps' => 'one',
+ 'recipient_canonical_maps' => 'one',
+ 'sender_canonical_maps' => 'one'
);
my %base = (
'transport_maps' => $ldapMap->{'mail_config_dn'},
@@ -2845,7 +2921,10 @@
'mynetworks' => $ldapMap->{'mail_config_dn'},
'masquerade_domains' => $ldapMap->{'dns_config_dn'},
'mydestination' => $ldapMap->{'dns_config_dn'},
- 'virtual_alias_maps' => $ldapMap->{'dns_config_dn'}
+ 'virtual_alias_maps' => $ldapMap->{'dns_config_dn'},
+ 'canonical_maps' => $ldapMap->{'mail_config_dn'},
+ 'recipient_canonical_maps' => $ldapMap->{'mail_config_dn'},
+ 'sender_canonical_maps' => $ldapMap->{'mail_config_dn'}
);
my %special_result_attribute = (
'alias_maps_member' => 'member',
Modified: branches/SuSE-Linux-10_3-Branch/mail/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/helps.ycp?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/src/helps.ycp (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/src/helps.ycp Tue Jan 29 17:27:28 2008
@@ -79,7 +79,9 @@
<p>How are you connected to the Internet? With a dial-up connection,
mails will not be sent immediately but rather after invoking
<b>sendmail -q</b>.</p>
-");
+") +
+_("<p>Choosing <b>No connection</b> the mail server will be started
+but only local mail transport is possible. The MTA listens on localhost.</p>");
return s;
}
Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail-advanced.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/mail-advanced.ycp?rev=43980&r1=43979&r2=43980&view=diff
==============================================================================
--- branches/SuSE-Linux-10_3-Branch/mail/src/mail-advanced.ycp (original)
+++ branches/SuSE-Linux-10_3-Branch/mail/src/mail-advanced.ycp Tue Jan 29 17:27:28 2008
@@ -36,13 +36,14 @@
* @param options map of options from command line
* @return boolean true on success
*/
-boolean SetupMailServer(map