[yast-commit] r41667 - in /trunk/mail: agents/sysconfig.mail src/MailServer.ycp src/mail-server_complex.ycp src/mail-server_dialogs.ycp src/mail-server_wizards.ycp src/mail.ycp
Author: varkoly
Date: Wed Oct 31 12:29:56 2007
New Revision: 41667
URL: http://svn.opensuse.org/viewcvs/yast?rev=41667&view=rev
Log:
fixing the return values of wizard elements
Modified:
trunk/mail/agents/sysconfig.mail
trunk/mail/src/MailServer.ycp
trunk/mail/src/mail-server_complex.ycp
trunk/mail/src/mail-server_dialogs.ycp
trunk/mail/src/mail-server_wizards.ycp
trunk/mail/src/mail.ycp
Modified: trunk/mail/agents/sysconfig.mail
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/agents/sysconfig.mail?rev=41667&r1=41666&r2=41667&view=diff
==============================================================================
--- trunk/mail/agents/sysconfig.mail (original)
+++ trunk/mail/agents/sysconfig.mail Wed Oct 31 12:29:56 2007
@@ -46,4 +46,4 @@
#
# This variable contains the type of the mail server configuration.
#
-CONF_TYPE="undef"
+CONFIG_TYPE="undef"
Modified: trunk/mail/src/MailServer.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServer.ycp?rev=41667&r1=41666&r2=41667&view=diff
==============================================================================
--- trunk/mail/src/MailServer.ycp (original)
+++ trunk/mail/src/MailServer.ycp Wed Oct 31 12:29:56 2007
@@ -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;
@@ -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" );
Modified: trunk/mail/src/mail-server_complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_complex.ycp?rev=41667&r1=41666&r2=41667&view=diff
==============================================================================
--- trunk/mail/src/mail-server_complex.ycp (original)
+++ trunk/mail/src/mail-server_complex.ycp Wed Oct 31 12:29:56 2007
@@ -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: trunk/mail/src/mail-server_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=41667&r1=41666&r2=41667&view=diff
==============================================================================
--- trunk/mail/src/mail-server_dialogs.ycp (original)
+++ trunk/mail/src/mail-server_dialogs.ycp Wed Oct 31 12:29:56 2007
@@ -41,7 +41,8 @@
Ldap::LDAPInit();
map
participants (1)
-
varkoly@svn.opensuse.org