Hello community, here is the log from the commit of package yast2-mail for openSUSE:Factory checked in at Mon Sep 28 08:58:38 CEST 2009. -------- --- yast2-mail/yast2-mail.changes 2009-08-07 17:08:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-mail/yast2-mail.changes 2009-09-28 08:39:17.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 28 08:37:46 CEST 2009 - varkoly@suse.de + +- bnc#532518 – YaST in translation (use 'YaST' instead of 'YaST2') + +------------------------------------------------------------------- +Tue Sep 8 16:37:11 CEST 2009 - varkoly@suse.de + +- Reorganize ldap tables + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-mail-2.18.0.tar.bz2 New: ---- yast2-mail-2.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-mail.spec ++++++ --- /var/tmp/diff_new_pack.giGM3V/_old 2009-09-28 08:58:25.000000000 +0200 +++ /var/tmp/diff_new_pack.giGM3V/_new 2009-09-28 08:58:25.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-mail (Version 2.18.0) +# spec file for package yast2-mail (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-mail -Version: 2.18.0 -Release: 3 +Version: 2.18.2 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-mail-2.18.0.tar.bz2 +Source0: yast2-mail-2.18.2.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later @@ -65,7 +65,7 @@ configuration. %prep -%setup -n yast2-mail-2.18.0 +%setup -n yast2-mail-2.18.2 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-mail-2.18.0.tar.bz2 -> yast2-mail-2.18.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/VERSION new/yast2-mail-2.18.2/VERSION --- old/yast2-mail-2.18.0/VERSION 2009-04-14 13:03:25.000000000 +0200 +++ new/yast2-mail-2.18.2/VERSION 2009-09-08 21:59:55.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.18.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/Mail.ycp new/yast2-mail-2.18.2/src/Mail.ycp --- old/yast2-mail-2.18.0/src/Mail.ycp 2009-07-20 12:49:00.000000000 +0200 +++ new/yast2-mail-2.18.2/src/Mail.ycp 2009-09-28 08:37:13.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner@suse.cz> * - * $Id: Mail.ycp 58118 2009-07-20 10:49:00Z varkoly $ + * $Id: Mail.ycp 58794 2009-09-28 06:37:12Z varkoly $ * * Representation of the configuration of mail. * Input and output routines. @@ -554,7 +554,7 @@ // %1 is a file name, // %2 is a long file name - leave it on a separate line Report::Error (sformat(_("Error reading file %1. The file must have -a fixed format to be readable by YaST2. For details, see +a fixed format to be readable by YaST. For details, see %2"), "/etc/fetchmailrc", "/usr/share/doc/packages/yast2-mail/fetchmailrc.txt")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/YaPI/MailServer.pm new/yast2-mail-2.18.2/src/YaPI/MailServer.pm --- old/yast2-mail-2.18.0/src/YaPI/MailServer.pm 2009-08-07 16:45:17.000000000 +0200 +++ new/yast2-mail-2.18.2/src/YaPI/MailServer.pm 2009-09-10 12:48:19.000000000 +0200 @@ -197,9 +197,8 @@ $GlobalSettings{'MaximumMailSize'} = read_attribute($MainCf,'message_size_limit'); # - $GlobalSettings{'Banner'} = `postconf -h smtpd_banner`; - $GlobalSettings{'Interfaces'} = `postconf -h inet_interfaces`; - chomp $GlobalSettings{'Banner'}; + chomp( $GlobalSettings{'Banner'} = `postconf -h smtpd_banner`); + chomp($GlobalSettings{'Interfaces'} = `postconf -h inet_interfaces`); # Determine if relay host is used $GlobalSettings{'SendingMail'}{'RelayHost'}{'Name'} = read_attribute($MainCf,'relayhost'); @@ -1278,11 +1277,9 @@ if($MailPrevention->{'BasicProtection'} eq 'hard') { #Write hard settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf, reject_unknown_sender_domain'); write_attribute($MainCf,'smtpd_helo_required','yes'); write_attribute($MainCf,'smtpd_helo_restrictions','permit_mynetworks, reject_invalid_hostname'); write_attribute($MainCf,'strict_rfc821_envelopes','yes'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); if( $clnt_restrictions ne '') { write_attribute($MainCf,'smtpd_client_restrictions',"permit_mynetworks, $clnt_restrictions, ldap:/etc/postfix/ldapaccess.cf, reject_unknown_client"); @@ -1295,11 +1292,9 @@ elsif($MailPrevention->{'BasicProtection'} eq 'medium') { #Write medium settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf, reject_unknown_sender_domain'); write_attribute($MainCf,'smtpd_helo_required','yes'); write_attribute($MainCf,'smtpd_helo_restrictions',''); write_attribute($MainCf,'strict_rfc821_envelopes','no'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); if( $clnt_restrictions ne '') { write_attribute($MainCf,'smtpd_client_restrictions',"$clnt_restrictions, ldap:/etc/postfix/ldapaccess.cf"); @@ -1312,12 +1307,10 @@ elsif($MailPrevention->{'BasicProtection'} eq 'off') { # Write off settings - write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf'); write_attribute($MainCf,'smtpd_helo_required','no'); write_attribute($MainCf,'smtpd_helo_restrictions',''); write_attribute($MainCf,'strict_rfc821_envelopes','no'); write_attribute($MainCf,'smtpd_client_restrictions','ldap:/etc/postfix/ldapaccess.cf'); - write_attribute($MainCf,'local_recipient_maps','$alias_maps, ldap:/etc/postfix/ldaplocal_recipient_maps.cf'); } else { @@ -1442,7 +1435,6 @@ 'wakeup' => '-', 'maxproc' => '-', 'options' => { content_filter => '', - local_recipient_maps => '', relay_recipient_maps => '', smtpd_delay_reject => 'no', smtpd_restriction_classes => '', @@ -1478,7 +1470,6 @@ } # now we looks if the ldap entries in the main.cf for the access table are OK. - check_ldap_configuration('local_recipient_maps',$ldapMap); check_ldap_configuration('access',$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); @@ -1643,7 +1634,7 @@ my $smtpd_recipient_restrictions = read_attribute($MainCf,'smtpd_recipient_restrictions'); my $smtpd_sasl_auth_enable = read_attribute($MainCf,'smtpd_sasl_auth_enable'); my $smtpd_use_tls = read_attribute($MainCf,'smtpd_use_tls'); - my $smtpd_enforce_tls = read_attribute($MainCf,'smtpd_enforce_tls'); + my $smtpd_enforce_tls = read_attribute($MainCf,'smtpd_enforce_tls') || 'no'; my $smtpd_tls_auth_only = read_attribute($MainCf,'smtpd_tls_auth_only'); if($smtpd_use_tls eq 'no') { @@ -1960,15 +1951,7 @@ #print STDERR Dumper([$MailLocalDelivery]); if( $MailLocalDelivery->{'Type'} ne 'none') { - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_folder.cf, ldap:/etc/postfix/ldapalias_maps.cf'); - check_ldap_configuration('alias_maps_folder',$ldapMap); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps_member',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_domains',$ldapMap); + write_ldap_maps($MainCf,$ldapMap); } if( $MailLocalDelivery->{'Type'} eq 'local') { @@ -2443,23 +2426,11 @@ # First we read the main.cf my $MainCf = SCR->Read('.mail.postfix.main.table'); - write_attribute($MainCf,'masquerade_domains','ldap:/etc/postfix/ldapmasquerade_domains.cf'); write_attribute($MainCf,'masquerade_classes','envelope_sender, header_sender, header_recipient'); write_attribute($MainCf,'masquerade_exceptions','root'); - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - write_attribute($MainCf,'alias_maps','hash:/etc/aliases, ldap:/etc/postfix/ldapalias_maps_folder.cf, ldap:/etc/postfix/ldapalias_maps.cf'); + write_ldap_maps($MainCf,$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); - check_ldap_configuration('masquerade_domains',$ldapMap); - check_ldap_configuration('mydestination',$ldapMap); - check_ldap_configuration('alias_maps_folder',$ldapMap); - check_ldap_configuration('local_recipient_maps',$ldapMap); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps_member',$ldapMap); - check_ldap_configuration('virtual_alias_domains',$ldapMap); return 1; } @@ -2619,9 +2590,27 @@ code => "SCR_INIT_FAILED", description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); } - if( ! SCR->Write('.ldap.add', - { "dn" => $uBase }, - $configOBJ->{$uBase} ) ) + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) + { + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_INIT_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } + $uBase = "ou=Aliases,ou=Mailserver,".$ldapMap->{'ldap_domain'}; + $configOBJ->{$uBase}->{'objectClass'} = 'organizationalUnit'; + $configOBJ->{$uBase}->{'ou'} = 'Aliases'; + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) + { + my $ldapERR = SCR->Read(".ldap.error"); + return $self->SetError(summary => "LDAP add failed", + code => "SCR_INIT_FAILED", + description => $ldapERR->{'code'}." : ".$ldapERR->{'msg'}); + } + $uBase = "ou=Canonical,ou=Mailserver,".$ldapMap->{'ldap_domain'}; + $configOBJ->{$uBase}->{'objectClass'} = 'organizationalUnit'; + $configOBJ->{$uBase}->{'ou'} = 'Canonical'; + if( ! SCR->Write('.ldap.add', { "dn" => $uBase }, $configOBJ->{$uBase} ) ) { my $ldapERR = SCR->Read(".ldap.error"); return $self->SetError(summary => "LDAP add failed", @@ -2945,41 +2934,10 @@ SCR->Execute('.mail.postfix.mastercf.deleteService', {'service' => 'tlsmgr','command' => 'tlsmgr'}); } } - #Setup the ldap tables; - # Transport - check_ldap_configuration('transport_maps',$ldapMap); - write_attribute($MainCf,'transport_maps','ldap:/etc/postfix/ldaptransport_maps.cf'); - # smtp_tls_per_site - check_ldap_configuration('smtp_tls_per_site',$ldapMap); - write_attribute($MainCf,'smtp_tls_per_site','ldap:/etc/postfix/ldapsmtp_tls_per_site.cf'); - # - write_attribute($MainCf,'masquerade_domains','ldap:/etc/postfix/ldapmasquerade_domains.cf'); write_attribute($MainCf,'masquerade_classes','envelope_sender, header_sender, header_recipient'); write_attribute($MainCf,'masquerade_exceptions','root'); - write_attribute($MainCf,'content_filter',''); - write_attribute($MainCf,'mydestination','$myhostname, localhost.$mydomain, $mydomain, ldap:/etc/postfix/ldapmydestination.cf'); - write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldaplocal_recipient_maps.cf, ldap:/etc/postfix/ldapvirtual_alias_maps_member.cf, ldap:/etc/postfix/ldapvirtual_alias_maps.cf'); - write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); - my $alias_maps = read_attribute($MainCf,'alias_maps'); - if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/) - { - $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf'; - } - if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/) - { - $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf'; - } - write_attribute($MainCf,'alias_maps',$alias_maps); - 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); - check_ldap_configuration('alias_maps_folder',$ldapMap); - check_ldap_configuration('alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps',$ldapMap); - check_ldap_configuration('virtual_alias_maps_member',$ldapMap); - check_ldap_configuration('virtual_alias_domains',$ldapMap); + #Setup the ldap tables; + write_ldap_maps($MainCf,$ldapMap); SCR->Write('.mail.postfix.main.table',$MainCf); SCR->Write('.mail.postfix.main',undef); SCR->Write('.mail.postfix.mastercf',undef); @@ -3119,6 +3077,7 @@ sub read_attribute { my $config = shift; my $attribute = shift; + my $a = undef; foreach(@{$config}) { if($_->{"key"} eq $attribute) @@ -3126,9 +3085,59 @@ return $_->{"value"} if defined $_->{"value"}; } } + chomp( $a = `postconf -h $attribute` ); + return $a if( defined $a ); return undef; } +# Internal helper Funktion to write the ldap maps +sub write_ldap_maps($$) +{ + my( $MainCf, $ldapMap ) = @_; + + my $alias_maps = read_attribute($MainCf,'alias_maps'); + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps_folder.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps_folder.cf'; + } + if($alias_maps !~ /ldap:\/etc\/postfix\/ldapalias_maps.cf/) + { + $alias_maps .= ', ldap:/etc/postfix/ldapalias_maps.cf'; + } + write_attribute($MainCf,'alias_maps',$alias_maps); + my $masquerade_domains = read_attribute($MainCf,'masquerade_domains'); + if($masquerade_domains !~ /ldap:\/etc\/postfix\/ldapmasquerade_domains.cf/) + { + $masquerade_domains .= ', ldap:/etc/postfix/ldapmasquerade_domains.cf'; + } + write_attribute($MainCf,'masquerade_domains',$masquerade_domains); + my $mydestination = read_attribute($MainCf,'mydestination'); + if($mydestination !~ /ldap:\/etc\/postfix\/ldapmydestination.cf/ ) + { + $mydestination .= ', ldap:/etc/postfix/ldapmydestination.cf'; + } + write_attribute($MainCf,'mydestination',$mydestination); + write_attribute($MainCf,'smtpd_sender_restrictions','ldap:/etc/postfix/ldapaccess.cf'); + write_attribute($MainCf,'smtp_tls_per_site','ldap:/etc/postfix/ldapsmtp_tls_per_site.cf'); + write_attribute($MainCf,'transport_maps','ldap:/etc/postfix/ldaptransport_maps.cf'); + write_attribute($MainCf,'virtual_alias_maps', 'ldap:/etc/postfix/ldapuser_recipient_maps.cf, ldap:/etc/postfix/ldapvalias_maps_both.cf, ldap:/etc/postfix/ldapvalias_maps_member.cf, ldap:/etc/postfix/ldapvalias_maps_folder.cf, ldap:/etc/postfix/ldapvalias_maps_forward.cf'); + write_attribute($MainCf,'virtual_alias_domains','ldap:/etc/postfix/ldapvirtual_alias_domains.cf'); + check_ldap_configuration('access',$ldapMap); + check_ldap_configuration('alias_maps',$ldapMap); + check_ldap_configuration('alias_maps_folder',$ldapMap); + check_ldap_configuration('masquerade_domains',$ldapMap); + check_ldap_configuration('mydestination',$ldapMap); + check_ldap_configuration('smtp_tls_per_site',$ldapMap); + check_ldap_configuration('transport_maps',$ldapMap); + check_ldap_configuration('user_recipient_maps',$ldapMap); + check_ldap_configuration('valias_maps_both',$ldapMap); + check_ldap_configuration('valias_maps_member',$ldapMap); + check_ldap_configuration('valias_maps_folder',$ldapMap); + check_ldap_configuration('valias_maps_forward',$ldapMap); + check_ldap_configuration('virtual_alias_domains',$ldapMap); + +} + # Internal helper Funktion to check if a needed ldap table is correctly defined # in the main.cf. If not so the neccesary entries will be created. sub check_ldap_configuration { @@ -3137,79 +3146,97 @@ my $changes = 0; my %query_filter = ( - 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', - 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', - 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))', - 'local_recipient_maps'=> '(&(objectClass=suseMailRecipient)(|(suseMailAcceptAddress=%s)(uid=%s)))', - 'alias_maps' => '(&(objectClass=suseMailRecipient)(|(uid=%s)(cn=%s)))', - 'alias_maps_folder' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToFolder=yes))', - 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))', - 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))', - 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))', - 'virtual_alias_maps_member' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes))', - 'virtual_alias_maps' => '(&(objectclass=suseMailRecipient)(suseMailAcceptAddress=%s))', - 'virtual_alias_domains' => '(&(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))' + 'access' => '(&(objectClass=suseMailAccess)(suseMailClient=%s))', + 'alias_maps' => '(&(objectClass=suseMailTable)(tableKey=%s))', + 'alias_maps_folder' => '(&(objectClass=suseMailRecipient)(cn=%s)(suseDeliveryToFolder=yes))', + 'masquerade_domains' => '(&(objectClass=suseMailDomain)(zoneName=%s)(suseMailDomainMasquerading=yes))', + 'mydestination' => '(&(objectClass=suseMailDomain)(zoneName=%s)(relativeDomainName=@)(!(suseMailDomainType=virtual)))', + 'mynetworks' => '(&(objectClass=suseMailMyNetworks)(suseMailClient=%s))', + 'smtp_tls_per_site' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', + 'transport_maps' => '(&(objectClass=suseMailTransport)(suseMailTransportDestination=%s))', + 'user_recipient_maps' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s))', + 'valias_maps_both' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes)(suseDeliveryToFolder=yes))', + 'valias_maps_member' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(suseDeliveryToMember=yes)(!(suseDeliveryToFolder=yes)))', + 'valias_maps_folder' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(!(suseDeliveryToMember=yes))(suseDeliveryToFolder=yes))', + 'valias_maps_forward' => '(&(objectClass=suseMailRecipient)(suseMailAcceptAddress=%s)(!(suseDeliveryToMember=yes))(!(suseDeliveryToFolder=yes)))', + 'virtual_alias_domains' => '(&(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', - 'smtp_tls_per_site' => 'suseTLSPerSiteMode', - 'access' => 'suseMailAction', - 'local_recipient_maps'=> 'uid', - 'alias_maps' => 'suseMailForwardAddress', - 'alias_maps_folder' => 'suseMailCommand', - 'mynetworks' => 'suseMailClient', - 'masquerade_domains' => 'zoneName', - 'mydestination' => 'zoneName', - 'virtual_alias_maps_member' => 'uid', - 'virtual_alias_maps' => 'cn', - 'virtual_alias_domains' => 'zoneName', - 'canonical_maps' => 'tableValue', - 'recipient_canonical_maps' => 'tableValue', - 'sender_canonical_maps' => 'tableValue' + 'access' => 'suseMailAction', + 'alias_maps' => 'tableValue', + 'alias_maps_folder' => 'suseMailCommand', + 'masquerade_domains' => 'zoneName', + 'mydestination' => 'zoneName', + 'mynetworks' => 'suseMailClient', + 'transport_maps' => 'suseMailTransportNexthop', + 'valias_maps_both' => 'suseMailForwardAddress,cn,uid', + 'valias_maps_member' => 'suseMailForwardAddress,uid', + 'valias_maps_folder' => 'suseMailForwardAddress,cn', + 'valias_maps_forward' => 'suseMailForwardAddress', + 'virtual_alias_domains' => 'zoneName', + 'canonical_maps' => 'tableValue', + 'recipient_canonical_maps'=> 'tableValue', + 'smtp_tls_per_site' => 'suseMailTransportNexthop', + 'sender_canonical_maps' => 'tableValue', + 'user_recipient_maps' => 'uid,suseMailForwardAddress' ); my %scope = ( - 'transport_maps' => 'one', - 'smtp_tls_per_site' => 'one', - 'access' => 'one', - 'local_recipient_maps'=> 'one', - 'alias_maps' => 'sub', - 'alias_maps_folder' => 'one', - 'mynetworks' => 'one', - 'masquerade_domains' => 'sub', - 'mydestination' => 'sub', - 'virtual_alias_maps_member' => 'one', - 'virtual_alias_maps' => 'one', - 'virtual_alias_domains' => 'sub', - 'canonical_maps' => 'one', - 'recipient_canonical_maps' => 'one', - 'sender_canonical_maps' => 'one' + 'access' => 'one', + 'alias_maps' => 'one', + 'alias_maps_folder' => 'one', + 'masquerade_domains' => 'sub', + 'mydestination' => 'sub', + 'mynetworks' => 'one', + 'transport_maps' => 'one', + 'smtp_tls_per_site' => 'one', + 'valias_maps_both' => 'one', + 'valias_maps_member' => 'one', + 'valias_maps_folder' => 'one', + 'valias_maps_forward' => 'one', + 'virtual_alias_domains' => 'sub', + 'canonical_maps' => 'one', + 'recipient_canonical_maps'=> 'one', + 'sender_canonical_maps' => 'one', + 'user_recipient_maps' => 'one' ); my %base = ( - 'transport_maps' => $ldapMap->{'mail_config_dn'}, - 'smtp_tls_per_site' => $ldapMap->{'mail_config_dn'}, - 'access' => $ldapMap->{'mail_config_dn'}, - 'local_recipient_maps'=> $ldapMap->{'user_config_dn'}, - 'alias_maps' => $ldapMap->{'ldap_domain'}, - 'alias_maps_folder' => $ldapMap->{'group_config_dn'}, - 'mynetworks' => $ldapMap->{'mail_config_dn'}, - 'masquerade_domains' => $ldapMap->{'dns_config_dn'}, - 'mydestination' => $ldapMap->{'dns_config_dn'}, - 'virtual_alias_maps_member' => $ldapMap->{'group_config_dn'}, - 'virtual_alias_maps' => $ldapMap->{'group_config_dn'}, - 'virtual_alias_domains' => $ldapMap->{'dns_config_dn'}, - 'canonical_maps' => $ldapMap->{'mail_config_dn'}, - 'recipient_canonical_maps' => $ldapMap->{'mail_config_dn'}, - 'sender_canonical_maps' => $ldapMap->{'mail_config_dn'} + 'access' => $ldapMap->{'mail_config_dn'}, + 'alias_maps' => 'ou=Aliases,'.$ldapMap->{'mail_config_dn'}, + 'alias_maps_folder' => $ldapMap->{'group_config_dn'}, + 'masquerade_domains' => $ldapMap->{'dns_config_dn'}, + 'mydestination' => $ldapMap->{'dns_config_dn'}, + 'mynetworks' => $ldapMap->{'mail_config_dn'}, + 'smtp_tls_per_site' => $ldapMap->{'mail_config_dn'}, + 'transport_maps' => $ldapMap->{'mail_config_dn'}, + 'valias_maps_both' => $ldapMap->{'group_config_dn'}, + 'valias_maps_member' => $ldapMap->{'group_config_dn'}, + 'valias_maps_folder' => $ldapMap->{'group_config_dn'}, + 'valias_maps_forward' => $ldapMap->{'group_config_dn'}, + 'virtual_alias_domains' => $ldapMap->{'dns_config_dn'}, + 'canonical_maps' => 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'recipient_canonical_maps'=> 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'sender_canonical_maps' => 'ou=Canonical,'.$ldapMap->{'mail_config_dn'}, + 'user_recipient_maps' => $ldapMap->{'user_config_dn'} ); my %special_result_attribute = ( - 'virtual_alias_maps_member' => 'member', + 'valias_maps_both' => 'member', + 'valias_maps_member' => 'member' ); + my %terminal_result_attribute = ( + 'valias_maps_both' => 'uid', + 'valias_maps_member' => 'uid' + ); +if( ! defined $result_attribute{$config} ) +{ + print STDERR "BAJAVAN $config"; + return; +} #First we read the whool main.cf configuration my $LDAPCF = SCR->Read('.mail.ldaptable',$config); @@ -3261,6 +3288,10 @@ { $LDAPCF->{'special_result_attribute'} = $special_result_attribute{$config}; } + if(defined $terminal_result_attribute{$config}) + { + $LDAPCF->{'terminal_result_attribute'} = $terminal_result_attribute{$config}; + } $LDAPCF->{'scope'} = $scope{$config}; SCR->Write('.mail.ldaptable',[$config,$LDAPCF]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/mail-server_helps.ycp new/yast2-mail-2.18.2/src/mail-server_helps.ycp --- old/yast2-mail-2.18.0/src/mail-server_helps.ycp 2008-10-06 12:16:08.000000000 +0200 +++ new/yast2-mail-2.18.2/src/mail-server_helps.ycp 2009-09-28 08:36:25.000000000 +0200 @@ -18,7 +18,7 @@ /* AuthorizingDialog dialog help 1/2 */ "AuthorizingDialog" : _("<p><b><big>Administrator Authorization</big></b><br> -To use the YaST2 mail server component, your system must use LDAP +To use the YaST mail server component, your system must use LDAP as a repository for the user and group accounts and for the DNS services.<br> Some of the mail server settings will be stored in the LDAP repository, too.<br></p> "), @@ -145,7 +145,7 @@ <br></p> ") + /* MailLocalDomains dialog help 2/3 */ -_("<p>Note: You can create and set up the domains with the YaST2 +_("<p>Note: You can create and set up the domains with the YaST DNS server module. In this module, you only can set the properties concerning the mail server. </p> @@ -155,7 +155,7 @@ You can define virtual and local domains. In virtual domains, only users assigned a mail address in the domain can receive mail. In local domains, all user can get mails. Assign virtual mail -addresses in the YaST2 user module. +addresses in the YaST user module. </p> "), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/suse-mailserver.schema new/yast2-mail-2.18.2/src/suse-mailserver.schema --- old/yast2-mail-2.18.0/src/suse-mailserver.schema 2009-01-04 07:49:44.000000000 +0100 +++ new/yast2-mail-2.18.2/src/suse-mailserver.schema 2009-09-08 16:19:04.000000000 +0200 @@ -178,8 +178,8 @@ DESC 'To build TLS per side maps' MUST ( suseTLSPerSiteMode $ suseTLSPerSitePeer ) ) -objectclass ( MailOC:7 NAME ( 'suseCanonicalTable' 'CanonicalTable' ) SUP top STRUCTURAL - DESC 'To build canonical maps' +objectclass ( MailOC:7 NAME ( 'suseMailTable' 'MailTable' ) SUP top STRUCTURAL + DESC 'To build Mail Tables' MUST ( tableKey $ tableValue ) MAY ( valueType $ description ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-mail-2.18.0/src/ui.ycp new/yast2-mail-2.18.2/src/ui.ycp --- old/yast2-mail-2.18.0/src/ui.ycp 2009-07-20 12:49:01.000000000 +0200 +++ new/yast2-mail-2.18.2/src/ui.ycp 2009-09-28 08:37:13.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Martin Vidner <mvidner@suse.cz> * - * $Id: ui.ycp 58118 2009-07-20 10:49:00Z varkoly $ + * $Id: ui.ycp 58794 2009-09-28 06:37:12Z varkoly $ * * All user interface functions. * @@ -91,7 +91,7 @@ // bb) read English // TODO: look at exim and mention it in the popup // Translators: error popup - Popup::Error (_("YaST2 can only configure Postfix and Sendmail, + Popup::Error (_("YaST can only configure Postfix and Sendmail, but neither of them is installed.")); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org