Author: varkoly Date: Fri Dec 12 06:37:33 2008 New Revision: 54079 URL: http://svn.opensuse.org/viewcvs/yast?rev=54079&view=rev Log: bnc#458553 - YaSt2 Mail module do not install cyrus-sasl-saslauthd new user has got default quota only quota value not readable in ncurses Modified: trunk/mail/src/MailServer.ycp trunk/mail/users-plugin/UsersPluginMail.pm trunk/mail/users-plugin/users_plugin_mail.ycp Modified: trunk/mail/src/MailServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=54079&r1=54078&r2=54079&view=diff ============================================================================== --- trunk/mail/src/MailServer.ycp (original) +++ trunk/mail/src/MailServer.ycp Fri Dec 12 06:37:33 2008 @@ -168,6 +168,7 @@ global boolean postfix_installed = false; global boolean fetchmail_installed = false; global boolean sasl_installed = false; +global boolean saslauthd_installed = false; global boolean plugins_installed = false; /* @@ -269,6 +270,7 @@ ldap_installed = Installed("yast2-ldap-client"); amavis_installed = Installed("amavisd-new"); sasl_installed = Installed("cyrus-sasl-plain"); + saslauthd_installed = Installed("cyrus-sasl-saslauthd"); plugins_installed = Installed("yast2-mail-plugins"); string to_install = ""; list<string> l_to_install = []; @@ -298,6 +300,11 @@ l_to_install = add( l_to_install, "cyrus-sasl-plain" ); to_install = to_install + "cyrus-sasl-plain\n"; } + if(!saslauthd_installed) + { + l_to_install = add( l_to_install, "cyrus-sasl-saslauthd" ); + to_install = to_install + "cyrus-sasl-saslauthd\n"; + } if(!plugins_installed) { l_to_install = add( l_to_install, "yast2-mail-plugins" ); Modified: trunk/mail/users-plugin/UsersPluginMail.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/users-plugin/UsersPluginMail.pm?rev=54079&r1=54078&r2=54079&view=diff ============================================================================== --- trunk/mail/users-plugin/UsersPluginMail.pm (original) +++ trunk/mail/users-plugin/UsersPluginMail.pm Fri Dec 12 06:37:33 2008 @@ -268,8 +268,7 @@ my $imapadmpw = Ldap->bind_pass(); my $MailLocalDelivery = YaPI::MailServer->ReadMailLocalDelivery($imapadmpw); $data->{'localdeliverytype'} = $MailLocalDelivery->{'Type'}; - if($data->{'localdeliverytype'} eq 'cyrus' ) { - #setting default quota + if($data->{'localdeliverytype'} eq 'cyrus' && ! defined $data->{'suseImapQuota'} ) { $data->{'suseImapQuota'} = $ldapret->[0]->{'suseImapDefaultQuota'}->[0]; } Modified: trunk/mail/users-plugin/users_plugin_mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/users-plugin/users_plugin_mail.ycp?rev=54079&r1=54078&r2=54079&view=diff ============================================================================== --- trunk/mail/users-plugin/users_plugin_mail.ycp (original) +++ trunk/mail/users-plugin/users_plugin_mail.ycp Fri Dec 12 06:37:33 2008 @@ -253,15 +253,13 @@ imap = `Frame ( _("IMAP Quota"), `VBox( `HBox( - `IntField (`id(`imapquota), _("in kByte"), 1, 10000000, - intimapquota >= 0 ? intimapquota : 10000), - `HStretch() + `CheckBox( `id(`enableImpapquota ), `opt(`notify), _("Enable IMAP Quota"), intimapquota >= 0), + `HSpacing(5), + `IntField (`id(`imapquota), _("in kByte"), 1, 10000000, intimapquota >= 0 ? intimapquota : 10000) ), - `Left(`Label(sformat (_("IMAP quota already in use: %1 kByte"), - data["imapquotaused"]:"0" != nil ? data["imapquotaused"]:"0":"0"))), - `Left(`CheckBox( `id(`enableImpapquota ), `opt(`notify), _("Enable IMAP Quota"), - intimapquota >= 0 - )) + `VSpacing(0.5), + `Left(`Label(sformat (_("IMAP quota already in use: %1 kByte"), + data["imapquotaused"]:"0" != nil ? data["imapquotaused"]:"0":"0"))) ) ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org