Author: rhafer Date: Fri Aug 8 17:23:48 2008 New Revision: 49883 URL: http://svn.opensuse.org/viewcvs/yast?rev=49883&view=rev Log: make interface more consistant with other YaST Modules Modified: trunk/ldap-server/src/LdapDatabase.ycp trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/complex.ycp trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server_proposal.ycp trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=49883&r1=49882&r2=49883&view=diff ============================================================================== --- trunk/ldap-server/src/LdapDatabase.ycp (original) +++ trunk/ldap-server/src/LdapDatabase.ycp Fri Aug 8 17:23:48 2008 @@ -17,7 +17,7 @@ define symbol AddDbBasic() { boolean user_changed_dbdir = false; - list dblist = LdapServer::GetDatabaseList(); + list dblist = LdapServer::ReadDatabaseList(); integer numDbs = size(dblist)-2; // don't count frontend and Config DB string caption = _("New Database"); string enctype = "SSHA"; @@ -129,7 +129,7 @@ continue; } - list > dblist = LdapServer::GetDatabaseList(); + list > dblist = LdapServer::ReadDatabaseList(); boolean exists = false; foreach(map db, dblist, { if ( suffix == db["suffix"]:"" ) Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=49883&r1=49882&r2=49883&view=diff ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Aug 8 17:23:48 2008 @@ -579,7 +579,7 @@ sub Summary { # Configuration summary text for autoyast my $self = shift; - my $defaults = $self->GetInitialDefaults(); + my $defaults = $self->CreateInitialDefaults(); my $string; $string .= '<h2>'._("Startup Configuration").'</h2>' @@ -654,8 +654,8 @@ return $serviceEnabled; } -BEGIN { $TYPEINFO {SetServiceEnabled} = ["function", "boolean", "boolean"]; } -sub SetServiceEnabled { +BEGIN { $TYPEINFO {WriteServiceEnabled} = ["function", "boolean", "boolean"]; } +sub WriteServiceEnabled { my $self = shift; $serviceEnabled = shift; return 1; @@ -673,10 +673,10 @@ return $registerSlp; } -BEGIN { $TYPEINFO {SetSLPEnabled} = ["function", "boolean", "boolean"]; } -sub SetSLPEnabled { +BEGIN { $TYPEINFO {WriteSLPEnabled} = ["function", "boolean", "boolean"]; } +sub WriteSLPEnabled { my $self = shift; - y2milestone("SetSlpEnabled"); + y2milestone("WriteSlpEnabled"); $registerSlp = shift; return 1; } @@ -701,20 +701,20 @@ $error{'details'} = $details; } -BEGIN { $TYPEINFO {GetError} = ["function", ["map", "string", "string"] ]; } -sub GetError +BEGIN { $TYPEINFO {ReadError} = ["function", ["map", "string", "string"] ]; } +sub ReadError { return \%error; } -BEGIN { $TYPEINFO {GetLogLevels} = ["function", [ "list", "string" ] ]; } -sub GetLogLevels +BEGIN { $TYPEINFO {ReadLogLevels} = ["function", [ "list", "string" ] ]; } +sub ReadLogLevels { return SCR->Read('.ldapserver.global.loglevel' ); } -BEGIN { $TYPEINFO {SetLogLevels} = ["function", "boolean", [ "list", "string" ] ]; } -sub SetLogLevels +BEGIN { $TYPEINFO {WriteLogLevels} = ["function", "boolean", [ "list", "string" ] ]; } +sub WriteLogLevels { my $self = shift; my $lvls = shift; @@ -722,20 +722,20 @@ return 1; } -BEGIN { $TYPEINFO {GetAllowFeatures} = ["function", [ "list", "string" ] ]; } -sub GetAllowFeatures +BEGIN { $TYPEINFO {ReadAllowFeatures} = ["function", [ "list", "string" ] ]; } +sub ReadAllowFeatures { return SCR->Read('.ldapserver.global.allow' ); } -BEGIN { $TYPEINFO {GetDisallowFeatures} = ["function", [ "list", "string" ] ]; } -sub GetDisallowFeatures +BEGIN { $TYPEINFO {ReadDisallowFeatures} = ["function", [ "list", "string" ] ]; } +sub ReadDisallowFeatures { return SCR->Read('.ldapserver.global.disallow' ); } -BEGIN { $TYPEINFO {SetAllowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } -sub SetAllowFeatures +BEGIN { $TYPEINFO {WriteAllowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } +sub WriteAllowFeatures { my $self = shift; my $features = shift; @@ -743,8 +743,8 @@ return 1; } -BEGIN { $TYPEINFO {SetDisallowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } -sub SetDisallowFeatures +BEGIN { $TYPEINFO {WriteDisallowFeatures} = ["function", "boolean", [ "list", "string" ] ]; } +sub WriteDisallowFeatures { my $self = shift; my $features = shift; @@ -752,14 +752,14 @@ return 1; } -BEGIN { $TYPEINFO {GetTlsConfig} = ["function", [ "map", "string", "any" ] ]; } -sub GetTlsConfig +BEGIN { $TYPEINFO {ReadTlsConfig} = ["function", [ "map", "string", "any" ] ]; } +sub ReadTlsConfig { return SCR->Read('.ldapserver.global.tlsSettings' ); } -BEGIN { $TYPEINFO {SetTlsConfig} = ["function", "boolean", [ "map", "string", "any" ] ]; } -sub SetTlsConfig +BEGIN { $TYPEINFO {WriteTlsConfig} = ["function", "boolean", [ "map", "string", "any" ] ]; } +sub WriteTlsConfig { my $self = shift; my $tls = shift; @@ -794,8 +794,8 @@ return 1; } -BEGIN { $TYPEINFO {SetTlsConfigCommonCert} = ["function", "boolean" ]; } -sub SetTlsConfigCommonCert +BEGIN { $TYPEINFO {WriteTlsConfigCommonCert} = ["function", "boolean" ]; } +sub WriteTlsConfigCommonCert { my $self = shift; my $ret = SCR->Execute(".target.bash", @@ -816,7 +816,7 @@ "crlCheck" => 0, "verifyClient" => 0 }; - return $self->SetTlsConfig( $tlsSettings ); + return $self->WriteTlsConfig( $tlsSettings ); } BEGIN { $TYPEINFO {MigrateSlapdConf} = ["function", "boolean"]; } @@ -886,10 +886,10 @@ return 1; } -BEGIN { $TYPEINFO {GetInitialDefaults} = ["function", [ "map", "string", "any"] ]; } -sub GetInitialDefaults +BEGIN { $TYPEINFO {CreateInitialDefaults} = ["function", [ "map", "string", "any"] ]; } +sub CreateInitialDefaults { - y2milestone("GetInitialDefaults"); + y2milestone("CreateInitialDefaults"); my $self = shift; if ( ! keys(%dbDefaults ) ) { $self->InitDbDefaults(); @@ -965,8 +965,8 @@ } else { - $self->SetTlsConfigCommonCert(); - $self->SetProtocolListenerEnabled("ldaps", 1); + $self->WriteTlsConfigCommonCert(); + $self->WriteProtocolListenerEnabled("ldaps", 1); } $globals_initialized = 1; } @@ -1045,10 +1045,10 @@ return 1; } -BEGIN { $TYPEINFO {GetDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } -sub GetDatabaseList +BEGIN { $TYPEINFO {ReadDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } +sub ReadDatabaseList { - y2milestone("GetDatabaseList"); + y2milestone("ReadDatabaseList"); my $self = shift; my $ret = (); my $rc = SCR->Read('.ldapserver.databases'); @@ -1063,21 +1063,21 @@ return $ret } -BEGIN { $TYPEINFO {GetDatabase} = ["function", [ "map" , "string", "string"], "integer" ]; } -sub GetDatabase +BEGIN { $TYPEINFO {ReadDatabase} = ["function", [ "map" , "string", "string"], "integer" ]; } +sub ReadDatabase { my ($self, $index) = @_; - y2milestone("GetDatabase ".$index); + y2milestone("ReadDatabase ".$index); my $rc = SCR->Read(".ldapserver.database.{".$index."}" ); y2milestone( "Database: ".Data::Dumper->Dump([$rc]) ); return $rc; } -BEGIN { $TYPEINFO {GetDatabaseIndexes} = ["function", [ "map" , "string", [ "map", "string", "boolean" ] ], "integer" ]; } -sub GetDatabaseIndexes +BEGIN { $TYPEINFO {ReadDatabaseIndexes} = ["function", [ "map" , "string", [ "map", "string", "boolean" ] ], "integer" ]; } +sub ReadDatabaseIndexes { my ($self, $index) = @_; - y2milestone("GetDatabase ".$index); + y2milestone("ReadDatabaseIndexes ".$index); my $rc = SCR->Read(".ldapserver.database.{".$index."}.indexes" ); y2milestone( "Indexes: ".Data::Dumper->Dump([$rc]) ); return $rc; @@ -1095,21 +1095,21 @@ return $rc; } -BEGIN { $TYPEINFO {GetOverlayList} = ["function", [ "list", [ "map" , "string", "string"] ], "integer" ]; } -sub GetOverlayList +BEGIN { $TYPEINFO {ReadOverlayList} = ["function", [ "list", [ "map" , "string", "string"] ], "integer" ]; } +sub ReadOverlayList { my ($self, $index) = @_; - y2milestone("GetOverlayList ", $index); + y2milestone("ReadOverlayList ", $index); my $rc = SCR->Read(".ldapserver.database.{".$index."}.overlays" ); y2milestone( "Overlays: ".Data::Dumper->Dump([$rc]) ); return $rc; } -BEGIN { $TYPEINFO {GetPpolicyOverlay} = ["function", [ "map" , "string", "any" ], "integer" ]; } -sub GetPpolicyOverlay +BEGIN { $TYPEINFO {ReadPpolicyOverlay} = ["function", [ "map" , "string", "any" ], "integer" ]; } +sub ReadPpolicyOverlay { my ($self, $index) = @_; - y2milestone("GetPpolicyOverlay ", $index); + y2milestone("ReadPpolicyOverlay ", $index); my $rc = SCR->Read(".ldapserver.database.{".$index."}.ppolicy" ); y2milestone( "Ppolicy: ".Data::Dumper->Dump([$rc]) ); if ( defined $rc->{'hashClearText'} ) @@ -1135,7 +1135,7 @@ $ppolicy->{'useLockout'} = YaST::YCP::Boolean($ppolicy->{'useLockout'}); # slapo-ppolicy requires ppolicy schema to be loaded - my $schema = $self->GetSchemaList(); + my $schema = $self->ReadSchemaList(); if ( ! grep( /^ppolicy$/, @{$schema} ) ) { my $rc = $self->AddSchemaToSchemaList("/etc/openldap/schema/ppolicy.schema"); @@ -1155,11 +1155,11 @@ } } -BEGIN { $TYPEINFO {GetSchemaList} = ["function", [ "list" , "string"] ]; } -sub GetSchemaList +BEGIN { $TYPEINFO {ReadSchemaList} = ["function", [ "list" , "string"] ]; } +sub ReadSchemaList { my $self = @_; - y2milestone("GetSchemaList "); + y2milestone("ReadSchemaList "); my $rc = SCR->Read(".ldapserver.schemaList" ); y2milestone( "SchemaList: ".Data::Dumper->Dump([$rc]) ); return $rc; @@ -1227,7 +1227,7 @@ if ( $index == 0 ) { # calculate new database index - $index = (scalar(@{$self->GetDatabaseList()} )) - 1; + $index = (scalar(@{$self->ReadDatabaseList()} )) - 1; } $rc = SCR->Write(".ldapserver.database.new.{$index}", $db); if(! $rc ) { @@ -1330,11 +1330,11 @@ return YaST::YCP::Boolean(1); } -BEGIN { $TYPEINFO {GetProtocolListenerEnabled} = ["function", "boolean", "string" ]; } -sub GetProtocolListenerEnabled +BEGIN { $TYPEINFO {ReadProtocolListenerEnabled} = ["function", "boolean", "string" ]; } +sub ReadProtocolListenerEnabled { my ( $self, $protocol ) = @_; - y2milestone("GetProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener)"); + y2milestone("ReadProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener)"); if ( $protocol eq "ldap" ) { return $use_ldap_listener; @@ -1353,11 +1353,11 @@ } } -BEGIN { $TYPEINFO {SetProtocolListenerEnabled} = ["function", "boolean", "string", "boolean" ]; } -sub SetProtocolListenerEnabled +BEGIN { $TYPEINFO {WriteProtocolListenerEnabled} = ["function", "boolean", "string", "boolean" ]; } +sub WriteProtocolListenerEnabled { my ( $self, $protocol, $enabled ) = @_; - y2milestone("SetProtocolListenerEnabled $protocol $enabled"); + y2milestone("WriteProtocolListenerEnabled $protocol $enabled"); if ( $protocol eq "ldap" ) { $use_ldap_listener = $enabled; Modified: trunk/ldap-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=49883&r1=49882&r2=49883&view=diff ============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Fri Aug 8 17:23:48 2008 @@ -189,7 +189,7 @@ symbol ret = Popup::AnyQuestion3( _("You have an existing configuration but the LDAP Server is not running currently."), _("Do you want to start it now to re-read its configuration data or do you want to create a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); if ( ret == `yes ) { - LdapServer::SetServiceEnabled( true ); + LdapServer::WriteServiceEnabled( true ); return `reread; } else if (ret == `no ) @@ -298,7 +298,7 @@ if (! LdapServer::MigrateSlapdConf()) { y2milestone("LdapServer::MigrateSlapdConf failed"); - DisplayError( LdapServer::GetError() ); + DisplayError( LdapServer::ReadError() ); return `abort; } LdapServer::Read(); @@ -422,7 +422,7 @@ if (! LdapServer::MigrateSlapdConf()) { y2milestone("LdapServer::MigrateSlapdConf failed"); - DisplayError( LdapServer::GetError() ); + DisplayError( LdapServer::ReadError() ); return `abort; } LdapServer::Read(); @@ -450,7 +450,7 @@ // LdapServer::AbortFunction = PollAbort; boolean ret = LdapServer::Write(); if (! ret ) { - map err = LdapServer::GetError(); + map err = LdapServer::ReadError(); if (err["details"]:"" != "" ) { Popup::ErrorDetails( err["msg"]:"", err["details"]:"" ); @@ -518,7 +518,7 @@ { if ( ! LdapServer::ReadFromDefaults() ) { - DisplayError( LdapServer::GetError() ); + DisplayError( LdapServer::ReadError() ); ret = `abort; } break; Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=49883&r1=49882&r2=49883&view=diff ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Fri Aug 8 17:23:48 2008 @@ -194,7 +194,7 @@ ); any EnableServiceDialog() { - map defaults = LdapServer::GetInitialDefaults(); + map defaults = LdapServer::CreateInitialDefaults(); map firewall_settings = $[ "services": [ "ldap" , "ldaps" ], "display_details": true, @@ -298,7 +298,7 @@ any ProposalDialog() { - map defaults = LdapServer::GetInitialDefaults(); + map defaults = LdapServer::CreateInitialDefaults(); string enctype = ""; boolean useCommonCA = false; boolean common_ca_available = ( CaMgm::prop_selection == `def || CaMgm::prop_selection == `floppy || CaMgm::prop_selection == `expert ); Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_proposal.ycp?rev=49883&r1=49882&r2=49883&view=diff ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Fri Aug 8 17:23:48 2008 @@ -58,13 +58,13 @@ if (!Package::Installed ("openldap2")) { y2milestone ("Openldap2 is not installed. --> service disabled"); - LdapServer::SetServiceEnabled (false); + LdapServer::WriteServiceEnabled (false); } else { - LdapServer::SetServiceEnabled( true ); + LdapServer::WriteServiceEnabled( true ); } - defaults = LdapServer::GetInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); defaults["rootpw_clear"] = Users::GetRootPassword(); LdapServer::SetInitialDefaults(defaults); } @@ -192,8 +192,8 @@ } Progress::off(); LdapServer::ReadFromDefaults(); - LdapServer::SetServiceEnabled( true ); - LdapServer::SetLogLevels( ["none"] ); + LdapServer::WriteServiceEnabled( true ); + LdapServer::WriteLogLevels( ["none"] ); Progress::on(); if( !LdapServer::HaveCommonServerCertificate() ) { @@ -202,9 +202,9 @@ } else { - LdapServer::SetTlsConfigCommonCert(); + LdapServer::WriteTlsConfigCommonCert(); } - LdapServer::SetSLPEnabled( true ); + LdapServer::WriteSLPEnabled( true ); LdapServer::Write(); } } Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.ycp?rev=49883&r1=49882&r2=49883&view=diff ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Aug 8 17:23:48 2008 @@ -96,7 +96,7 @@ UI::ChangeWidget( `fr_listener, `Enabled, false ); UI::ChangeWidget( `fr_firewall, `Enabled, false ); } - if ( LdapServer::GetProtocolListenerEnabled("ldap") ) + if ( LdapServer::ReadProtocolListenerEnabled("ldap") ) { UI::ChangeWidget( `cb_interface_ldap, `Value, true ); } @@ -104,7 +104,7 @@ { UI::ChangeWidget( `cb_interface_ldap, `Value, false ); } - if ( LdapServer::GetProtocolListenerEnabled("ldaps") ) + if ( LdapServer::ReadProtocolListenerEnabled("ldaps") ) { UI::ChangeWidget( `cb_interface_ldaps, `Value, true ); } @@ -112,7 +112,7 @@ { UI::ChangeWidget( `cb_interface_ldaps, `Value, false ); } - if ( LdapServer::GetProtocolListenerEnabled("ldapi") ) + if ( LdapServer::ReadProtocolListenerEnabled("ldapi") ) { UI::ChangeWidget( `cb_interface_ldapi, `Value, true ); } @@ -150,40 +150,40 @@ CWMFirewallInterfaces::OpenFirewallStore (fw_widget, "", $[]); if ( serviceEnabled == `rb_yes ) { - LdapServer::SetServiceEnabled( true ); + LdapServer::WriteServiceEnabled( true ); } else { - LdapServer::SetServiceEnabled( false ); + LdapServer::WriteServiceEnabled( false ); } - LdapServer::SetProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ); - LdapServer::SetProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ); + LdapServer::WriteProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ); + LdapServer::WriteProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ); if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldaps ), `Value ) ) { - map tls = LdapServer::GetTlsConfig(); + map tls = LdapServer::ReadTlsConfig(); if ( (string)tls["caCertFile"]:"" != "" && (string)tls["certFile"]:"" != "" && (string)tls["certKeyFile"]:"" != "" ) { - LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", true ); } else { if ( Popup::YesNoHeadline( _("Your TLS/SSL Configuration seems to be incomplete."), _("Do you really want to enable the \"ldaps\" protocol listener?") ) ) { - LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", true ); } else { - LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", false ); } } } else { - LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", false ); } return true; } @@ -191,7 +191,7 @@ define boolean cb_read_schema() ``{ y2milestone( "calling schema read handler" ); - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); return true; } @@ -201,7 +201,7 @@ y2milestone( "calling schema input handler" ); - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); string current_item = (string)UI::QueryWidget( `sb_schemalist, `CurrentItem ); y2milestone( "current_item is '%1'", current_item ); @@ -222,20 +222,20 @@ if ( regexpmatch( new_item, ".*\.schema$" ) ) { if (! LdapServer::AddSchemaToSchemaList(new_item) ) { - map err = LdapServer::GetError(); + map err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); } else if (! LdapServer::AddLdifToSchemaList(new_item) ) { - map err = LdapServer::GetError(); + map err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } else { - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); } @@ -243,7 +243,7 @@ { if( current_item == nil ) return true; LdapServer::RemoveFromSchemaList(current_item); - list<string> inclist = LdapServer::GetSchemaList(); + list<string> inclist = LdapServer::ReadSchemaList(); update_schemalist( inclist ); } return true; @@ -261,7 +261,7 @@ define boolean cb_read_loglevel() ``{ y2milestone( "calling loglevel read handler" ); - list<string> lvls = LdapServer::GetLogLevels(); + list<string> lvls = LdapServer::ReadLogLevels(); UI::ChangeWidget( `msb_loglevel, `SelectedItems, lvls ); return true; @@ -273,7 +273,7 @@ list<string> idlist = (list<string>)UI::QueryWidget( `msb_loglevel, `SelectedItems ); y2milestone( "writing loglevel: '%1'", idlist ); - return LdapServer::SetLogLevels( idlist ); + return LdapServer::WriteLogLevels( idlist ); } /***************************** @@ -288,8 +288,8 @@ define boolean cb_read_allow() ``{ y2milestone( "calling allow read handler" ); - list<string> allowlist = LdapServer::GetAllowFeatures(); - list<string> disallowlist = LdapServer::GetDisallowFeatures(); + list<string> allowlist = LdapServer::ReadAllowFeatures(); + list<string> disallowlist = LdapServer::ReadDisallowFeatures(); UI::ChangeWidget( `msb_allow, `SelectedItems, allowlist ); UI::ChangeWidget( `msb_disallow, `SelectedItems, disallowlist ); return true; @@ -304,8 +304,8 @@ disallowlist = (list<string>)UI::QueryWidget( `msb_disallow, `SelectedItems ); y2milestone( "writing allowlist: '%1'", allowlist ); - LdapServer::SetAllowFeatures( allowlist ); - LdapServer::SetDisallowFeatures( disallowlist ); + LdapServer::WriteAllowFeatures( allowlist ); + LdapServer::WriteDisallowFeatures( disallowlist ); return true; } @@ -316,7 +316,7 @@ define boolean cb_read_tls() ``{ y2milestone( "calling tls read handler" ); - map tls = LdapServer::GetTlsConfig(); + map tls = LdapServer::ReadTlsConfig(); y2milestone( "tls config %1", tls ); if ( (string)tls["caCertFile"]:"" != "" && (string)tls["certFile"]:"" != "" && @@ -342,7 +342,7 @@ UI::ChangeWidget( `cb_use_common_cert, `Enabled, false ); UI::ChangeWidget( `fr_import_cert, `Enabled, false ); } - UI::ChangeWidget( `cb_ssl_listener_enabled, `Value, LdapServer::GetProtocolListenerEnabled("ldaps") ); + UI::ChangeWidget( `cb_ssl_listener_enabled, `Value, LdapServer::ReadProtocolListenerEnabled("ldaps") ); UI::ChangeWidget( `te_ca_file, `Value, tls["caCertFile"]:"" ); UI::ChangeWidget( `te_cert_file, `Value, tls["certFile"]:"" ); UI::ChangeWidget( `te_key_file, `Value, tls["certKeyFile"]:"" ); @@ -383,13 +383,13 @@ callback_error = _("Please select a valid Certificate Key File"); return false; } - if ( ! LdapServer::SetTlsConfig( tlsSettings ) ) + if ( ! LdapServer::WriteTlsConfig( tlsSettings ) ) { - map err = LdapServer::GetError(); + map err = LdapServer::ReadError(); callback_error = err["msg"]:"" + err["details"]:""; return false; } - LdapServer::SetProtocolListenerEnabled( "ldaps", (boolean) UI::QueryWidget( `id( `cb_ssl_listener_enabled ), `Value ) ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", (boolean) UI::QueryWidget( `id( `cb_ssl_listener_enabled ), `Value ) ); } else { @@ -404,8 +404,8 @@ "verifyClient" : 0 ]; - LdapServer::SetTlsConfig( tlsSettings ); - LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + LdapServer::WriteTlsConfig( tlsSettings ); + LdapServer::WriteProtocolListenerEnabled( "ldaps", false ); } return true; } @@ -500,7 +500,7 @@ define boolean cb_read_databases() ``{ y2milestone( "calling databases read handler" ); - list > dblist = LdapServer::GetDatabaseList(); + list > dblist = LdapServer::ReadDatabaseList(); string text = HTML::Para( HTML::Bold( _("Available Databases:") ) )+HTML::Newline(); foreach( map db, dblist, { string tmp = sformat("%1 (%2)", db["suffix"]:"", db["type"]:"" ); @@ -526,9 +526,9 @@ if (ret == `next ) { rebuild_widget_tree = true; - if ( ! LdapServer::AddDatabase(0, LdapDatabase::GetDatabase(), LdapDatabase::GetCreateDir() ) ) + if ( ! LdapServer::AddDatabase(0, LdapDatabase::ReadDatabase(), LdapDatabase::GetCreateDir() ) ) { - map err = LdapServer::GetError(); + map err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; return false; } @@ -574,7 +574,7 @@ if( db["rootdn"]:"" != "" && (boolean)UI::QueryWidget( `cb_append_basedn, `Value ) ) { - map olddb = LdapServer::GetDatabase(index); + map olddb = LdapServer::ReadDatabase(index); string suffix = olddb["suffix"]:""; db["rootdn"] = db["rootdn"]:"" + "," + suffix; } @@ -650,7 +650,7 @@ return false; } - map db = LdapServer::GetDatabase( index ); + map db = LdapServer::ReadDatabase( index ); // string suffix = (string)widget_map[current_tree_item,"name"]:nil; // if( suffix == nil ) @@ -733,7 +733,7 @@ { integer index = (integer) widget_map[current_tree_item, "index"]:nil; y2milestone("cb_read_bdb_index current item: %1, index %2", current_tree_item, index); - map > idxMap = LdapServer::GetDatabaseIndexes( index ); + map > idxMap = LdapServer::ReadDatabaseIndexes( index ); integer i=0; list newItems = []; foreach( string attr, map idx, idxMap, { @@ -771,7 +771,7 @@ list<string> skip = []; string editAttr = ""; map idx = $[]; - map > idxMap = LdapServer::GetDatabaseIndexes( index ); + map > idxMap = LdapServer::ReadDatabaseIndexes( index ); if (handler_cmd == `pb_idx_add ) { // skip attribute that already have an index defined foreach( string attr, map idx, idxMap, @@ -836,14 +836,14 @@ y2milestone("cb_read_ppolicy()"); integer index = (integer)widget_map[current_tree_item,"index"]:nil; // Check for ppolicy overlay - map ppolicy_map = LdapServer::GetPpolicyOverlay(index); + map ppolicy_map = LdapServer::ReadPpolicyOverlay(index); if ( size(ppolicy_map) != 0 ){ UI::ChangeWidget( `cb_ppolicy_overlay, `Value, true ); boolean pp_hash_cleartext = (boolean)ppolicy_map["hashClearText"]:nil; boolean pp_use_lockout = (boolean)ppolicy_map["useLockout"]:nil; string pp_default = (string)ppolicy_map["defaultPolicy"]:nil; boolean pp_append_checked = false; - map olddb = LdapServer::GetDatabase(index); + map olddb = LdapServer::ReadDatabase(index); string suffix = olddb["suffix"]:""; integer pos = search( pp_default, suffix ); if( pos > -1 ) @@ -912,7 +912,7 @@ if (pp_default != "" ) { if( (boolean)UI::QueryWidget( `cb_pp_append_basedn, `Value ) ) { - map db = LdapServer::GetDatabase(index); + map db = LdapServer::ReadDatabase(index); string suffix = db["suffix"]:""; pp_default = pp_default+","+suffix; } @@ -925,11 +925,11 @@ y2milestone("Policy: %1", ppolicy); result = LdapServer::AddPasswordPolicy( index, ppolicy ); if ( ! result ) { - map err = LdapServer::GetError(); + map err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; } } else { - map ppolicy_map = LdapServer::GetPpolicyOverlay(index); + map ppolicy_map = LdapServer::ReadPpolicyOverlay(index); if ( size(ppolicy_map) == 0 ) { result = true; @@ -939,7 +939,7 @@ // delete ppolicy result = LdapServer::AddPasswordPolicy( index, $[] ); if ( ! result ) { - map err = LdapServer::GetError(); + map err = LdapServer::ReadError(); callback_error = err["msg"]:"" + "\n" + err["details"]:""; } } @@ -1080,7 +1080,7 @@ y2debug( "generating database tree items" ); //generate database entries - list > dblist = LdapServer::GetDatabaseList(); + list > dblist = LdapServer::ReadDatabaseList(); integer i = 0; foreach( map db, dblist, { string tmp = sformat("%1 (%2)", db["suffix"]:"", db["type"]:"" ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org