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 options) +boolean SetupMailServer() { any ret = SetupSequence(); return true; } -map cmdline_description = $[ +map cmdline_description = +$[ "id" : "mail-server", /* Command line help text for the mail-server module */ "help" : _("Configuration of mail server"), @@ -85,6 +86,10 @@ { ret = MailServerAutoSequence(); } +else if(setup) +{ + ret = SetupSequence(); +} else { ret = CommandLine::Run(cmdline_description); Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_complex.ycp?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_complex.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_complex.ycp Tue Jan 29 17:27:28 2008 @@ -37,7 +37,7 @@ * Read settings dialog * @return `abort if aborted and `next otherwise */ -boolean SetupDialog() { +symbol SetupDialog() { Wizard::RestoreHelp(HELPS["setup"]:""); string caption = _("Setup the Mail Server"); integer steps = 3; @@ -74,17 +74,17 @@ Progress::NextStage(); if( ! MailServer::CheckPackages() ) { - return false; + return `abort; } sleep(sl); // read packages Progress::NextStage(); if( CheckLDAPDialog() != `ok ) { - return false; + return `abort; } sleep(sl); - return true; + return `next; } /** Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_dialogs.ycp?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_dialogs.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_dialogs.ycp Tue Jan 29 17:27:28 2008 @@ -32,6 +32,7 @@ */ define any CheckLDAPDialog () { + y2milestone("--Start CheckLDAPDialog ---"); boolean ca_mgm = false; boolean conf_ldap_server = false; boolean setup_ldap_server = false; @@ -40,10 +41,12 @@ Ldap::LDAPInit(); map LDAPSettings = (map ) Ldap::Export(); list args = []; - if(LDAPSettings["ldap_domain"]:"" == "" ) + y2milestone(" LDAPSettings %1", LDAPSettings); + if( ! LDAPSettings["start_ldap"]:false ) { //No LDAP-Client configuration setup_ldap_server = true; ca_mgm = true; + conf_ldap_server = true; comment = _("Your computer is not configured as LDAP-client.") + "<br>" + _("We suggest to setup a local LDAP-server for the mail server.") + "<br>" + _("To secure your system we suggest to create certificates for the LDAP and Mail Server.") + "<br>"; @@ -52,14 +55,14 @@ { //The computer is configured as LDAP-Client if( LDAPSettings["ldap_server"]:"" == "127.0.0.1" ) { // The LDAP-Server is local - comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + "<br>" + + comment = _("Your computer is configured as LDAP-client and the LDAP-Server is local.") + "<br>" + _("We suggest to adapt the LDAP-server configuration for the mail server.") + "<br>" + _("For this reason you have to know the password of the LDAP-administrator account:") + "<br>" + "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>"; } else { // The LDAP-Server is not local - comment = _("Your computer is configured as LDAP-client and the LDAP-Server is not local.") + "<br>" + + comment = _("Your computer is configured as LDAP-client and the LDAP-Server is not local.") + "<br>" + _("We suggest to configure the LDAP-server for the mail server.") + "<br>" + _("For this reason you have to know the password of the LDAP-administrator account:") + "<br>" + "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>" + @@ -100,20 +103,43 @@ { // Now we setup the ca managemant args = add(args, "ca_mgm"); } + Progress::NextStage(); if( setup_ldap_server ) { // Now we setup the LDAP Server args = add(args, "setup"); + } + if( setup_ldap_server || ca_mgm || conf_ldap_server ) + { WFM::CallFunction("mail-server_ldap-setup",args); Ldap::Read(); Ldap::LDAPInit(); - LDAPSettings = (map ) Ldap::Export(); } - string adminpw = Ldap::LDAPAskAndBind(false); - if( adminpw != nil ) + Progress::NextStage(); + MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); + if( MailServer::AdminPassword != nil ) { - YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings); + block<boolean> abort = ``{ + if (UI::PollInput () == `abort && + // popup text + Popup::YesNo (_("Really abort the writing process?"))) + return true; + return false; + }; + + //tell Ldap module to create the default objects: + LDAPSettings [ "create_ldap" ] = true; + Ldap::Import(LDAPSettings); +y2milestone("after LDAPSettings %1", LDAPSettings); + //write the settings: + Ldap::Write(abort); + //create default mail-server configuration + YaPI::MailServer::ResetMailServer(MailServer::AdminPassword,LDAPSettings); + return `ok; + } + else + { + return `abort; } - return `ok; } /** @@ -124,6 +150,7 @@ define any AuthorizingDialog () { + y2milestone("--Start AuthorizingDialog ---"); Ldap::Read(); map LDAPSettings = Ldap::Export(); if(LDAPSettings["bind_dn"]:"" == "" ) @@ -140,6 +167,7 @@ } Ldap::Read(); } + Ldap::LDAPInit(); integer size1 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/servercert.pem"); integer size2 = (integer)SCR::Read(.target.size, "/etc/ssl/servercerts/serverkey.pem"); @@ -152,11 +180,16 @@ MailServer::CertExist = true; } - return Ldap::LDAPAskAndBind(false); - + MailServer::AdminPassword = Ldap::LDAPAskAndBind(false); + if( MailServer::AdminPassword == nil ) + { + return `abort; + } + return `next; } -list<map> GenerateTree(list<map> Tree, string parent, list<list> input) { +list<map> GenerateTree(list<map> Tree, string parent, list<list> input) +{ foreach(list i, input, ``{ string title = i[0]:""; @@ -170,7 +203,9 @@ return Tree; } -term GlobalSettingsDialog() { +term GlobalSettingsDialog() +{ + y2milestone("--Start GlobalSettingsDialog ---"); boolean limit = ((string)MailServer::GlobalSettings["MaximumMailSize"]:"0" != "0"); boolean is_DNS = ((string)MailServer::GlobalSettings["SendingMail","Type"]:"" == "DNS"); boolean is_NONE = ((string)MailServer::GlobalSettings["SendingMail","Type"]:"" == "NONE"); @@ -302,7 +337,8 @@ return content; } -list<term> MakeSelectedList(list<string> items, string value ) { +list<term> MakeSelectedList(list<string> items, string value ) +{ list<term> SelectedList = []; foreach(string i, items, ``{ if( i == value ) { @@ -314,7 +350,9 @@ return SelectedList; } -void ShowMailTransport(string CID, string ACTION) { +void ShowMailTransport(string CID, string ACTION) +{ + y2milestone("--Start ShowMailTransport ---"); list > Transports = (list >) MailServer::MailTransports["Transports"]:[]; map TLSSites = (map) MailServer::MailTransports["TLSSites"]:$[]; map SASLAccounts = (map) MailServer::MailTransports["SASLAccounts"]:$[]; @@ -549,7 +587,9 @@ return; } -term MailTransportsDialog() { +term MailTransportsDialog() +{ + y2milestone("--Start MailTransportsDialog ---"); list > Transports = (list >) MailServer::MailTransports["Transports"]:[]; map TLSSites = (map) MailServer::MailTransports["TLSSites"]:$[]; list Transport_items = []; @@ -595,7 +635,9 @@ return content; } -term MailPreventionDialog(string CID, string CIDRBL) { +term MailPreventionDialog(string CID, string CIDRBL) +{ + y2milestone("--Start MailTransportsDialog ---"); list<term> AccessItems= []; list<term> RBLItems = []; string BasicProtection = (string)MailServer::MailPrevention["BasicProtection"]:""; @@ -627,6 +669,8 @@ }); term content = `VBox ( + `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)), + `VSpacing (1), `Frame(_("SPAM Prevention"), `HBox( `HWeight(7, @@ -672,13 +716,13 @@ ) ) ) - ), - `Left(`CheckBox (`id(`VirusScanning), `opt(`notify), _("Start Virus Scanner AMAVIS"), VirusScanning)) + ) ); return content; } -string RBLAdd () { +string RBLAdd () +{ UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New RBL Server"), `VBox( `TextEntry(`id(`server), "", ""), @@ -703,7 +747,8 @@ return server; } -map AccessAdd () { +map AccessAdd () +{ UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New Sender Restriction"), `VBox( `TextEntry(`id(`NewSender), _("Sender Address"), ""), @@ -737,7 +782,9 @@ return SenderRestriction; } -term MailRelayingDialog() { +term MailRelayingDialog() +{ + y2milestone("--Start MailRelayingDialog ---"); // boolean UserRestriction = ((string)MailServer::MailRelaying["UserRestriction"]:"0" == "1"); boolean RequireSASL = ((string)MailServer::MailRelaying["RequireSASL"]:"0" == "1"); boolean SMTPDTLSnone = ((string)MailServer::MailRelaying["SMTPDTLSMode"]:"none" == "none"); @@ -795,7 +842,9 @@ return content; } -term MailLocalDeliveryDialog() { +term MailLocalDeliveryDialog() +{ + y2milestone("--Start MailLocalDeliveryDialog ---"); boolean TypeCYRUS = ((string)MailServer::MailLocalDelivery["Type"]:"" == "cyrus"); boolean TypePROCMAIL = ((string)MailServer::MailLocalDelivery["Type"]:"" == "procmail"); boolean TypeLOCAL = ((string)MailServer::MailLocalDelivery["Type"]:"" == "local"); @@ -933,7 +982,9 @@ return content; } -term FetchingMailDialog() { +term FetchingMailDialog() +{ + y2milestone("--Start FetchingMailDialog ---"); list<term> table_items = []; integer IID = 0; list > entries = (list >) MailServer::FetchingMail["Items"]:[]; @@ -1017,7 +1068,9 @@ return content; } -map FetchmailAddItem(){ +map FetchmailAddItem() +{ + y2milestone("--Start FetchmailAddItem ---"); UI::OpenDialog(`opt(`decorated ), `Frame(_("Add New Fetchmail Job"), `VBox( `TextEntry(`id(`server), _("Server Address"), ""), @@ -1070,7 +1123,9 @@ } -term MailLocalDomainsDialog(string CID) { +term MailLocalDomainsDialog(string CID) +{ + y2milestone("--Start MailLocalDomainsDialog ---"); list<term> Domains = []; boolean NoLocalDelivery = ((string)MailServer::MailLocalDelivery["Type"]:"" == "none"); if(NoLocalDelivery) { @@ -1122,8 +1177,9 @@ return content; } -void ShowMailLocalDomain(string CID, string ACTION) { - +void ShowMailLocalDomain(string CID, string ACTION) +{ + y2milestone("--Start ShowMailLocalDomain ---"); string Name = ""; string Type = "local"; boolean Masquerading = true; @@ -1198,6 +1254,7 @@ boolean CheckMainDomain() { + y2milestone("--Start CheckMainDomain ---"); integer maindomain = 0; integer domains = 0; @@ -1226,7 +1283,7 @@ any ComplexDialog() { - + y2milestone("--Start ComplexDialog ---"); Wizard::CreateTreeDialog(); list<map> Tree = GenerateTree([], "", MailServer::ModulesTreeContent) ; Wizard::CreateTree(Tree, _("Mail Server Configuration")); Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp Tue Jan 29 17:27:28 2008 @@ -33,11 +33,16 @@ y2milestone("--- mail-server-ldap-setup ---"); // First we check if all requested modules are installed - if( !Package::Installed ( "ldap-server" ) ) + if( contains(args,"setup") && !Package::Installed ( "yast2-ldap-server" ) ) { l_to_install = add( l_to_install, "yast2-ldap-server" ); to_install = to_install + "yast2-ldap-server\n"; } + if( contains(args,"setup") && !Package::Installed ( "bind-utils" ) ) + { + l_to_install = add( l_to_install, "bind-utils" ); + to_install = to_install + "bind-utils\n"; + } if(contains(args,"ca_mgm") ) { if( !Package::Installed ( "yast2-ca-management" ) ) @@ -70,23 +75,11 @@ if(contains(args,"setup") ) { WFM::CallFunction("ldap-server",[]); + MailServerLDAP::ConfigureLDAPServer(); } if(contains(args,"setup") ) { WFM::CallFunction("ldap",[]); } - Ldap::Read(); - Ldap::LDAPInit(); - map LDAPSettings = (map)Ldap::Export(); - string adminpw = Ldap::LDAPAskAndBind(false); - MailServerLDAP::ConfigureLDAPServer(LDAPSettings); - if( adminpw != nil ) - { - YaPI::MailServer::ResetMailServer(adminpw,LDAPSettings); - } - else - { - return false; - } return true; } Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_wizards.ycp?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_wizards.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_wizards.ycp Tue Jan 29 17:27:28 2008 @@ -109,6 +109,10 @@ `abort : `abort, `next : "main" ], + "main" : $[ + `abort : `abort, + `next : `next + ] ]; Wizard::CreateDialog(); Modified: branches/SuSE-Linux-10_3-Branch/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/mail.ycp?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/mail.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/mail.ycp Tue Jan 29 17:27:28 2008 @@ -139,7 +139,6 @@ Popup::Error(_("You have to select a configuration type")); continue; } - SCR::Write (.sysconfig.mail.CONFIG_TYPE, sret); y2milestone ("Mail configuration type %1", sret); break; } @@ -205,7 +204,12 @@ { ret = WFM::CallFunction("mail-standard",args); } + y2milestone ("Mail module %1 returned %2", conf_type, ret); + if( ret != nil && ret != `cancel && ret != `abort ) + { + SCR::Write (.sysconfig.mail.CONFIG_TYPE, conf_type); + } } define boolean Setup (map options) ``{ Modified: branches/SuSE-Linux-10_3-Branch/mail/src/suse-mailserver.schema URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/suse-mailserver.schema?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/suse-mailserver.schema (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/suse-mailserver.schema Tue Jan 29 17:27:28 2008 @@ -122,6 +122,24 @@ SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) +attributetype ( MailAT:19 NAME ( 'tableKey') + DESC 'Shows the imap quota of a user.' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} + SINGLE-VALUE ) + +attributetype ( MailAT:20 NAME ( 'tableValue') + DESC 'Shows the imap quota of a user.' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} + SINGLE-VALUE ) + +attributetype ( MailAT:21 NAME ( 'valueType') + DESC 'Shows the imap quota of a user.' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{16} + SINGLE-VALUE ) + ## ## Objectclass Section ## @@ -154,3 +172,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' + MUST ( tableKey $ tableValue ) + MAY ( valueType $ description ) ) + Modified: branches/SuSE-Linux-10_3-Branch/mail/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/src/widgets.ycp?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/widgets.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/widgets.ycp Tue Jan 29 17:27:28 2008 @@ -221,8 +221,16 @@ // when validating: may be enclosed in brackets (prevents mx lookups) string oms = (string) UI::QueryWidget (`id (id), `Value); // watch this: "[", no brackets, "]" - string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? - regexpsub (oms, ".(.*).", "\\1") : oms; + string oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]:.*") ? regexpsub (oms, ".(.*).:.*", "\\1") : oms; + + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, "[[][^][]*[]]") ? regexpsub (oms, ".(.*).", "\\1") : oms; + } + if( oms_no_brackets == oms ) + { + oms_no_brackets = regexpmatch (oms, ".*:.*") ? regexpsub (oms, "(.*):.*", "\\1") : oms; + } if (oms_no_brackets != "" && ! Address::Check (oms_no_brackets) Modified: branches/SuSE-Linux-10_3-Branch/mail/yast2-mail.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/mail/yast2-mail.spec.in?rev=43980&r1=43979&r2=43980&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/yast2-mail.spec.in (original) +++ branches/SuSE-Linux-10_3-Branch/mail/yast2-mail.spec.in Tue Jan 29 17:27:28 2008 @@ -1,13 +1,13 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite +BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite BuildRequires: yast2-perl-bindings yast2-ldap-server yast2-users yast2-network PreReq: %fillup_prereq # new firewall interface -Requires: yast2 >= 2.11.11 +Requires: yast2 >= 2.16.23 Requires: yast2-users Requires: yast2-ldap -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org