Author: rhafer Date: Mon Nov 21 14:18:40 2011 New Revision: 66880 URL: http://svn.opensuse.org/viewcvs/yast?rev=66880&view=rev Log: cleanup: removed some chunks of disabled and no longer needed code Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/complex.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=66880&r1=66879&r2=66880&view=diff ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Mon Nov 21 14:18:40 2011 @@ -279,15 +279,6 @@ # server started $slapdConfChanged = 1; } -# y2milestone("Using slapcat to import configuration"); -# my $rc = SCR->Execute('.target.bash_output', -# "/usr/sbin/slapcat -F /etc/openldap/slapd.d -b cn=config" ); -# y2milestone("slapcat result: ". Data::Dumper->Dump([$rc])); -# SCR->Execute('.ldapserver.initFromLdif', $rc->{'stdout'}); -# $rc = SCR->Read('.ldapserver.databases' ); -# y2milestone("Databases: ". Data::Dumper->Dump([$rc])); -# #$rc = SCR->Read('.ldapserver.global.tlsSettings' ); -# #y2milestone("tlsSettings: ". Data::Dumper->Dump([$rc])); } } else Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=66880&r1=66879&r2=66880&view=diff ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Mon Nov 21 14:18:40 2011 @@ -196,151 +196,8 @@ return ret; -/* - switchToBackConfig = Popup::ContinueCancelHeadline( _("Convert to \"Back-Config\"?"), -_("Your system is currently configured to use the -configuration file /etc/openldap/slapd.conf. This YaST -module will switch OpenLDAP to use the dynamic configuration -database of OpenLDAP (back-config).")); - if (switchToBackConfig) - { - convert = Popup::YesNoHeadline( _("Convert existing configuration?"), -_("Do you want to convert your existing configuration -files, to the dynamic configuration backend? -Note: This will remove any preexisting configuration data -from \"/etc/openldap/slapd.d/\". -If you click \"No\" here, an empty configuration will -be created")); - if (convert) - { - // Convert the existing configuration and after that - // re-read it. - if (! LdapServer::MigrateSlapdConf()) - { - y2milestone("LdapServer::MigrateSlapdConf failed"); - DisplayError( LdapServer::ReadError() ); - return `abort; - } - LdapServer::Read(); - } - } - else - { - return `abort; - } -*/ } -// -// The ldapserver Agent does currently only support SASL External Authentication, -// no need to ask for a cn=config password here. -// -//symbol MigrationDialog() -//{ -// string caption = "Migrate existing Configuration"; -// string summary = _("In order to access the server configration after the migration you need -//to configure how YaST should authenticate against the configuration database."); -// list enc_types = [ -// `item( `id( "CRYPT" ), "CRYPT" ), -// `item( `id( "SMD5" ), "SMD5" ), -// `item( `id( "SHA" ), "SHA" ), -// `item( `id( "SSHA" ), "SSHA", true ), -// `item( `id( "PLAIN" ), "PLAIN" ) -// ]; -// term contents = -// `VBox( -// `HSquash( -// `RadioButtonGroup( `id( `rb ), -// `VBox( -// `Label( summary ), -// `Left( -// `RadioButton( `id( `rb_ldapi ), `opt(`notify), -// _("Access the Server via LDAP over Unix Domain Sockets (ldapi) -//and give \"root\" full access to the configuration."), true ) -// ), -// `Left( -// `RadioButton( `id( `rb_passwd ), `opt(`notify), -// _("Use a \"normal\" encrypted LDAP connection with LDAP -//simple authentication.") ) -// ), -// `Left( -// `Label( `id( `lab_pw ), _("Please enter a password for the configuration user (cn=config)") ) -// ), -// `Password( `id( `te_rootpw ), _("New &Password") ), -// `HSpacing( 0.5 ), -// `Password( `id( `te_valid_rootpw ), _("&Validate Password") ), -// `HSpacing( 0.5 ), -// `ComboBox( `id( `cb_cryptmethod ), _("Password &Encryption"), enc_types ) -// ) -// ) -// ) -// ); -// -// Wizard::SetContentsButtons(caption, contents, HELPS["summary"]:"", -// Label::BackButton(), Label::NextButton()); -// -// UI::ChangeWidget( `lab_pw , `Enabled, false ); -// UI::ChangeWidget( `te_rootpw , `Enabled, false ); -// UI::ChangeWidget( `te_valid_rootpw , `Enabled, false ); -// UI::ChangeWidget( `cb_cryptmethod , `Enabled, false ); -// symbol ret = `next; -// while(true) { -// ret = (symbol)UI::UserInput(); -// -// /* abort? */ -// if (ret == `abort || ret == `cancel ) -// { -// if( Popup::ReallyAbort(true)) -// { -// break; -// } -// else -// { -// continue; -// } -// } -// else if ( ret == `next ) -// { -// symbol current = (symbol) UI::QueryWidget(`id(`rb), `CurrentButton); -// if ( current == `rb_ldapi ) -// { -// LdapServer::UseLdapiForConfig( true ); -// ret = `next; -// } -// else -// { -// ret = `initial; -// } -// break; -// } -// else if ( ret == `back ) -// { -// break; -// } -// else if ( ret == `rb_ldapi ) -// { -// UI::ChangeWidget( `lab_pw , `Enabled, false ); -// UI::ChangeWidget( `te_rootpw , `Enabled, false ); -// UI::ChangeWidget( `te_valid_rootpw , `Enabled, false ); -// UI::ChangeWidget( `cb_cryptmethod , `Enabled, false ); -// } -// else if ( ret == `rb_passwd ) -// { -// UI::ChangeWidget( `lab_pw , `Enabled, true ); -// UI::ChangeWidget( `te_rootpw , `Enabled, true ); -// UI::ChangeWidget( `te_valid_rootpw , `Enabled, true ); -// UI::ChangeWidget( `cb_cryptmethod , `Enabled, true ); -// } -// else -// { -// y2error("unexpected retcode: %1", ret); -// continue; -// } -// } -// -// return ret; -//} - symbol DoMigration() { LdapServer::UseLdapiForConfig( true ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org