Author: varkoly Date: Thu Jan 31 11:07:59 2008 New Revision: 44035 URL: http://svn.opensuse.org/viewcvs/yast?rev=44035&view=rev Log: ldap client have to be configured in all cases Modified: 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 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=44035&r1=44034&r2=44035&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 Thu Jan 31 11:07:59 2008 @@ -68,6 +68,7 @@ "<B>" + LDAPSettings["bind_dn"]:"" + ".</B><BR>" + _("Furthermore the LDAP-Server have to contain the <B>suse-mailserver.schema</B> and the correspondig index entries."); } + conf_ldap_server = true; } // Now we create the dialog: @@ -108,6 +109,10 @@ { // Now we setup the LDAP Server args = add(args, "setup"); } + if( conf_ldap_server ) + { // Now we setup the LDAP Server + args = add(args, "conf"); + } if( setup_ldap_server || ca_mgm || conf_ldap_server ) { WFM::CallFunction("mail-server_ldap-setup",args); 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=44035&r1=44034&r2=44035&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 11:07:59 2008 @@ -80,11 +80,11 @@ if(contains(args,"setup") ) { WFM::CallFunction("ldap-server",[]); - MailServerLDAP::ConfigureLDAPServer(); } - if(contains(args,"setup") ) + if(contains(args,"conf") ) { - WFM::CallFunction("ldap",[]); + 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