Author: varkoly Date: Thu Jan 31 16:54:15 2008 New Revision: 44079 URL: http://svn.opensuse.org/viewcvs/yast?rev=44079&view=rev Log: correct the order of the funktions Modified: branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm branches/SuSE-Linux-10_3-Branch/mail/src/mail-server_ldap-setup.ycp 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=44079&r1=44078&r2=44079&view=diff ============================================================================== --- branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm (original) +++ branches/SuSE-Linux-10_3-Branch/mail/src/MailServerLDAP.pm Thu Jan 31 16:54:15 2008 @@ -30,7 +30,6 @@ our %TYPEINFO; -YaST::YCP::Import ("Ldap"); YaST::YCP::Import ("YaPI::LdapServer"); YaST::YCP::Import ("Service"); @@ -54,48 +53,48 @@ { push @{$schemas},'/etc/openldap/schema/suse-mailserver.schema'; YaPI::LdapServer->WriteSchemaIncludeList($schemas); - my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain}); - my $SuSEMailClient = 0; - my $SuSEMailDomainMasquerading = 0; - my $suseTLSPerSitePeer= 0; - foreach my $index (@{$indices}) - { - if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName") - { - $SuSEMailClient = 1; - } - if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType") - { - $SuSEMailDomainMasquerading = 1; - } - if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination") - { - $suseTLSPerSitePeer = 1; - } - } - if(!$SuSEMailClient) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName", - "param" => "eq" } - ); - } - if(!$SuSEMailDomainMasquerading) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType", - "param" => "eq" } - ); - } - if(!$suseTLSPerSitePeer) - { - YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, - { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", - "param" => "eq" } - ); - } - YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain}); } + my $indices = YaPI::LdapServer->ReadIndex($ldapMap->{ldap_domain}); + my $SuSEMailClient = 0; + my $SuSEMailDomainMasquerading = 0; + my $suseTLSPerSitePeer= 0; + foreach my $index (@{$indices}) + { + if( $index->{attr} eq "SuSEMailClient,SUSEMailAcceptAddress,zoneName") + { + $SuSEMailClient = 1; + } + if( $index->{attr} eq "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType") + { + $SuSEMailDomainMasquerading = 1; + } + if( $index->{attr} eq "suseTLSPerSitePeer,SuSEMailTransportDestination") + { + $suseTLSPerSitePeer = 1; + } + } + if(!$SuSEMailClient) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "SuSEMailClient,SUSEMailAcceptAddress,zoneName", + "param" => "eq" } + ); + } + if(!$SuSEMailDomainMasquerading) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "SuSEMailDomainMasquerading,relativeDomainName,suseMailDomainType", + "param" => "eq" } + ); + } + if(!$suseTLSPerSitePeer) + { + YaPI::LdapServer->AddIndex($ldapMap->{ldap_domain}, + { "attr" => "suseTLSPerSitePeer,SuSEMailTransportDestination", + "param" => "eq" } + ); + } + YaPI::LdapServer->RecreateIndex($ldapMap->{ldap_domain}); Service->Restart("ldap"); } } 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=44079&r1=44078&r2=44079&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 Thu Jan 31 16:54:15 2008 @@ -81,10 +81,10 @@ { WFM::CallFunction("ldap-server",[]); } + WFM::CallFunction("ldap",[]); if(contains(args,"conf") || contains(args,"setup") ) { MailServerLDAP::ConfigureLDAPServer(); } - WFM::CallFunction("ldap",[]); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org