[yast-commit] r59748 - /branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp
Author: rhafer Date: Tue Nov 24 17:54:02 2009 New Revision: 59748 URL: http://svn.opensuse.org/viewcvs/yast?rev=59748&view=rev Log: Ignore missing root password in slave setup More for bnc#558019 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp?rev=59748&r1=59747&r2=59748&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Tue Nov 24 17:54:02 2009 @@ -87,17 +87,20 @@ { string rootPWString = ""; defaults = LdapServer::ReadInitialDefaults(); - if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) + if (! LdapServer::ReadSetupSlave() ) { - rootPWString = _("[root password]"); - } else - { - rootPWString = _("[manually set]"); - } - if( defaults["rootpw_clear"]:"" == "" ) - { - warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); - warning_level = `blocker; + if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) + { + rootPWString = _("[root password]"); + } else + { + rootPWString = _("[manually set]"); + } + if( defaults["rootpw_clear"]:"" == "" ) + { + warning = _("Unable to retrieve the system root password. Set an LDAP server password to continue."); + warning_level = `blocker; + } } // Try to get Firewall status string fw_text = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
rhafer@svn.opensuse.org