[yast-commit] r47753 - in /trunk/mail/src: mail-server_dialogs.ycp mail-server_ldap-setup.ycp

Author: varkoly Date: Wed May 21 14:09:32 2008 New Revision: 47753 URL: http://svn.opensuse.org/viewcvs/yast?rev=47753&view=rev Log: fixing double id fixing ldap-server setup Modified: trunk/mail/src/mail-server_dialogs.ycp trunk/mail/src/mail-server_ldap-setup.ycp Modified: trunk/mail/src/mail-server_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_dialogs.ycp?rev=47753&r1=47752&r2=47753&view=diff ============================================================================== --- trunk/mail/src/mail-server_dialogs.ycp (original) +++ trunk/mail/src/mail-server_dialogs.ycp Wed May 21 14:09:32 2008 @@ -330,7 +330,7 @@ `VBox( `HBox( `Left(`RadioButton(`id("DNS"), `opt (`notify), _("Direct Delivery (DNS)"), is_DNS)), - `Left(`RadioButton(`id("NONE"), `opt (`notify), _("No Outgoing Mail"), is_NONE)) + `Left(`RadioButton(`id("NOOUT"), `opt (`notify), _("No Outgoing Mail"), is_NONE)) ), `Left(`RadioButton(`id("relayhost"), `opt (`notify), _("Use Relay Host"), is_RELAY)), relayhost @@ -1344,6 +1344,11 @@ MailServer::GlobalSettings["MaximumMailSize"] = "0"; } MailServer::GlobalSettings["Banner"] = UI::QueryWidget(`id(`Banner), `Value); + string SMT = (string)UI::QueryWidget(`id(`SendingMailType), `CurrentButton); + if( SMT == "NOOUT" ) + { + SMT = "NONE"; + } MailServer::GlobalSettings["SendingMail","Type"] = UI::QueryWidget(`id(`SendingMailType), `CurrentButton); MailServer::GlobalSettings["SendingMail","TLS"] = UI::QueryWidget(`id(`SendingMailTLS), `CurrentButton); MailServer::GlobalSettings["SendingMail","RelayHost","Name"] = ""; @@ -1636,10 +1641,10 @@ MailServer::MailLocalDelivery["Security"] = "0"; MailServer::MailRelaying["SMTPDTLSMode"] = "none"; } - if (focus_changed) +/* if (focus_changed) { UI::SetFocus (`id (`wizardTree)); - } + } */ } } UI::CloseDialog(); Modified: trunk/mail/src/mail-server_ldap-setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_ldap-setup.ycp?rev=47753&r1=47752&r2=47753&view=diff ============================================================================== --- trunk/mail/src/mail-server_ldap-setup.ycp (original) +++ trunk/mail/src/mail-server_ldap-setup.ycp Wed May 21 14:09:32 2008 @@ -86,8 +86,7 @@ if(contains(args,"local")) { map LDB = MailServerLDAP::ConfigureLDAPServer(); - SCR::Write(.sysconfig.ldap.BASE_CONFIG_DN,LDB["suffix"]); - SCR::Write(.sysconfig.ldap.BIND_DN,LDB["rootdn"]:""); + SCR::Write(.sysconfig.ldap.BASE_CONFIG_DN,LDB["suffix"]:""); SCR::Write(.sysconfig.ldap.BIND_DN,LDB["rootdn"]:""); SCR::Write(.sysconfig.ldap,nil); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org