Mailing Lists
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2023
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
List overview
Download
YaST Commits
July 2008
----- 2023 -----
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
yast-commit@lists.opensuse.org
26 participants
870 discussions
Start a n
N
ew thread
[yast-commit] r49554 - in /trunk/ldap-server/src: LdapServer.pm dialogs.ycp tree_structure.ycp
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:29 2008 New Revision: 49554 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49554&view=rev
Log: Fixed firewall settings Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:29 2008 @@ -26,6 +26,7 @@ our %TYPEINFO; YaST::YCP::Import ("Progress"); +YaST::YCP::Import ("SuSEFirewall"); YaST::YCP::Import ("Service"); my %error = ( msg => undef, details => undef ); @@ -141,6 +142,7 @@ sub Read { y2milestone(""); + SuSEFirewall->Read(); my $progressItems = [ "Reading Startup Configuration", "Reading Configuration Backend", "Reading Configuration Data" ]; @@ -346,7 +348,7 @@ { SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no'); } - + SuSEFirewall->Write(); my $wasEnabled = Service->Enabled("ldap"); if ( !$wasEnabled && $serviceEnabled ) { @@ -475,6 +477,7 @@ return 0; } Progress->Finish(); + SuSEFirewall->Write(); } else { my $wasEnabled = Service->Enabled("ldap"); if ( $wasEnabled && !$serviceEnabled ) @@ -519,6 +522,7 @@ SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no'); } + SuSEFirewall->Write(); if( ! SCR->Execute('.ldapserver.commitChanges' ) ) { my $err = SCR->Error(".ldapserver"); Modified: trunk/ldap-server/src/dialogs.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Thu Jul 31 17:15:29 2008 @@ -184,7 +184,9 @@ `VBox( `Frame( _("Firewall Settings"), `VBox( - fw_widget["custom_widget"]:`Empty(), + `ReplacePoint( `id( `rp_firewall ), + `Empty() + ), `HStretch() ) ) @@ -201,8 +203,12 @@ map<string, any> firewall_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (firewall_settings); - Wizard::SetContentsButtons( caption, dlg_service_initial, HELPS["service_dialog"]:"help not found", - Label::BackButton(), Label::NextButton() ); + Wizard::SetContentsButtons( caption, dlg_service_initial, HELPS["service_dialog"]:"help not found", Label::BackButton(), Label::NextButton() ); + + UI::ReplaceWidget(`rp_firewall, + firewall_widget["custom_widget"]:`Empty() + ); + CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, ""); if( (boolean)defaults["serviceEnabled"]:true ) { @@ -213,7 +219,6 @@ UI::ChangeWidget( `cb_register_slp, `Enabled, false ); } - CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, ""); any ret = nil; map event = $[]; while( true ) @@ -447,12 +452,21 @@ callHandler( current_tree_item, "cb_read" ); rebuild_widget_tree = false; } - ret = UI::UserInput(); + map event = UI::WaitForEvent(); + ret = event["ID"]:nil; y2milestone( "TreeDialog: seeing return value %1", ret ); + if( is( ret, string ) || ret == `wizardTree ) { string new_item = Wizard::QueryTreeItem(); + // workaround to catch changes in the firewall widget + if ( is( ret, string) && ( issubstring( (string)ret, "firewall" ) ) ) + { + CWMFirewallInterfaces::OpenFirewallHandle (fw_widget, "", event); + continue; + } + //check values of current tree item y2milestone( "wizard-->current item is %1", current_tree_item ); Modified: trunk/ldap-server/src/tree_structure.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y…
============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Thu Jul 31 17:15:29 2008 @@ -85,6 +85,7 @@ ``{ y2milestone("calling read handler for item \"daemon\""); boolean enabled = LdapServer::ReadServiceEnabled(); + CWMFirewallInterfaces::OpenFirewallInit (fw_widget, ""); if ( enabled ) { UI::ChangeWidget( `rb_service_enable, `CurrentButton, `rb_yes ); @@ -146,6 +147,7 @@ y2milestone("calling write handler for item \"daemon\""); symbol serviceEnabled = (symbol)UI::QueryWidget(`id(`rb_service_enable), `CurrentButton); + CWMFirewallInterfaces::OpenFirewallStore (fw_widget, "", $[]); if ( serviceEnabled == `rb_yes ) { LdapServer::SetServiceEnabled( true ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49553 - /trunk/ldap-server/src/widgets.ycp
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:25 2008 New Revision: 49553 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49553&view=rev
Log: Disable network interface details buttons for now Modified: trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/widgets.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Thu Jul 31 17:15:25 2008 @@ -44,21 +44,21 @@ `Left( `HBox( `HWeight(1, `CheckBox( `id( `cb_interface_ldap), _("LDAP"), false )), - `HWeight(1, `PushButton( `id( `pb_interface_ldap), "Interfaces ...")), + //`HWeight(1, `PushButton( `id( `pb_interface_ldap), "Interfaces ...")), `HWeight(1, `HStretch()) ) ), `Left( `HBox( `HWeight(1, `CheckBox( `id( `cb_interface_ldaps), _("LDAP over SSL (ldaps)"), false )), - `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")), + //`HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")), `HWeight(1, `HStretch()) ) ), `Left( `HBox( `HWeight(1, `CheckBox( `id( `cb_interface_ldapi), _("LDAP over IPC (ldapi)"), false ) ), - `HWeight(1, `PushButton( `id( `pb_interface_ldapi), "Interfaces ...") ), + //`HWeight(1, `PushButton( `id( `pb_interface_ldapi), "Interfaces ...") ), `HWeight(1, `HStretch()) ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49552 - in /trunk/ldap-server/src: LdapServer.pm complex.ycp dialogs.ycp wizards.ycp
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:22 2008 New Revision: 49552 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49552&view=rev
Log: Improved workflow in situation where slapd is not running/disabled Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/complex.ycp trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/wizards.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:22 2008 @@ -310,6 +310,62 @@ } return 1; } + + +## + # Write all service-related settings (sysconfig, init.d) + # @return true on success + # +BEGIN { $TYPEINFO{WriteServiceSettings} = ["function", "boolean"]; } +sub WriteServiceSettings { + my $self = shift; + y2milestone("LdapServer::Write"); + my $ret = 1; + # these changes might require a restart of slapd + if ( $use_ldap_listener ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'yes'); + } + else + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'no'); + } + if ( $use_ldapi_listener ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'yes'); + } + else + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'no'); + } + if ( $use_ldaps_listener ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'yes'); + } + else + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no'); + } + + my $wasEnabled = Service->Enabled("ldap"); + if ( !$wasEnabled && $serviceEnabled ) + { + # service was disabled during this session, just disable the service + # in the system, stop it and ignore any configuration changes. + my $progressItems = [ _("Enabling LDAP Server"), + _("Starting LDAP Server") + ]; + Progress->New(_("Activating OpenLDAP Server"), "", 2, $progressItems, $progressItems, ""); + Progress->NextStage(); + Service->Enable("ldap"); + Progress->NextStage(); + Service->Start("ldap"); + Progress->Finish(); + return 0; + } + return 1; +} + ## # Write all ldap-server settings # @return true on success Modified: trunk/ldap-server/src/complex.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Thu Jul 31 17:15:22 2008 @@ -153,6 +153,9 @@ } boolean hasBackconfig = LdapServer::IsUsingBackconfig(); boolean configModified = LdapServer::SlapdConfChanged(); //original shipped slapd.conf? + + boolean serviceEnabled = LdapServer::ReadServiceEnabled(); + boolean serviceRunning = LdapServer::ReadServiceRunning(); boolean switchToBackConfig = false; boolean convert = false; @@ -181,6 +184,25 @@ LdapServer::InitDbDefaults(); return `initial; } + else if ( !serviceEnabled || !serviceRunning ) + { + 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 ); + return `reread; + } + else if (ret == `no ) + { + // Start new config wizward + LdapServer::InitDbDefaults(); + return `initial; + } + else if ( ret == `retry ) + { + return `abort; + } + } } return `next; @@ -406,6 +428,19 @@ LdapServer::Read(); return `next; } + +/** + * Write service settings dialog. This dialog writes only the service + * settings (sysconfig and init.d stuff) + * @return `reread if configuration needs to be reread and `next otherwise + */ +symbol WriteServiceDialog() { + Wizard::RestoreHelp(HELPS["write"]:""); + // LdapServer::AbortFunction = PollAbort; + boolean ret = LdapServer::WriteServiceSettings(); + return ret ? `next : `reread; +} + /** * Write settings dialog * @return `abort if aborted and `next otherwise Modified: trunk/ldap-server/src/dialogs.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Thu Jul 31 17:15:22 2008 @@ -110,13 +110,32 @@ { //create new item term widget = nil; - if ( !LdapServer::ReadServiceEnabled() || !LdapServer::ReadServiceRunning() ) + if ( !LdapServer::ReadServiceEnabled() ) { if ( name != "daemon" ) { Popup::Error( _("The LDAP Server is disabled currently, no configuration changes possible.") ); name = "daemon"; } } + else if ( !LdapServer::ReadServiceRunning() ) + { + if ( name != "daemon" ) { + symbol ret = Popup::AnyQuestion3( _("The LDAP Server is not running."), _("Do you want to start it now to re-read its configuration data or do you want to creat a new configuration from scratch?"), _("Restart"), _("New Configuration"), Label::AbortButton(), `focus_yes ); + name = "daemon"; + if ( ret == `yes ) + { + return "__reread__"; + } + else if ( ret == `no ) + { + return "__empty__"; + } + else if ( ret == `retry ) + { + return name; + } + } + } widget = (term)widget_map[name,"widget"]:`Label( "Loading widget for item '"+name+"' failed." ); //get helps page @@ -450,6 +469,16 @@ } current_tree_item = showTreeDialog( new_item, (ret == `wizardTree) ? true : false ); + if ( current_tree_item == "__reread__" ) + { + ret = `reread; + break; + } + if ( current_tree_item == "__empty__" ) + { + ret = `empty; + break; + } Wizard::SelectTreeItem( current_tree_item ); callHandler( current_tree_item, "cb_read" ); Modified: trunk/ldap-server/src/wizards.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/wizards.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/wizards.ycp (original) +++ trunk/ldap-server/src/wizards.ycp Thu Jul 31 17:15:22 2008 @@ -25,7 +25,8 @@ /* FIXME: adapt to your needs */ map aliases = $[ - "tree" : ``( TreeDialog() ) + "tree" : ``( TreeDialog() ), + "writeservice" : ``( WriteServiceDialog() ) ]; map sequence = $[ @@ -34,7 +35,12 @@ `abort : `abort, `back : `abort, `cancel : `abort, - `next : `next + `next : `next, + `reread : "writeservice", + `empty : `empty + ], + "writeservice" : $[ + `reread : `reread ] ]; @@ -155,7 +161,8 @@ "read" : ``( ReadDialog() ), "migrate" : ``( MigrateSequence() ), "propose" : ``( ProposalSequence() ), - "main" : ``( MainSequence() ), + "main" : ``( MainSequence() ), + "writeservice" : ``( WriteServiceDialog() ), "write" : ``( WriteDialog() ) ]; @@ -165,7 +172,8 @@ `abort : `abort, `initial : "propose", `migrate : "migrate", - `next : "main" + `next : "main", + `reread : "writeservice" ], "migrate" : $[ `abort : `abort, @@ -178,8 +186,12 @@ ], "main" : $[ `abort : `abort, - `next : "write" + `next : "write", + `reread : "read" ], + "writeservice" : $[ + `reread : "read" + ], "write" : $[ `abort : `abort, `next : `next -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49551 - in /trunk/ldap-server/src: LdapServer.pm tree_structure.ycp
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:18 2008 New Revision: 49551 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49551&view=rev
Log: Write Protocol listener flags back to sysconfig Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:18 2008 @@ -346,8 +346,6 @@ Progress->Finish(); return 0; } - $rc = SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAPI'); - y2milestone(Data::Dumper->Dump([$rc])); # FIXME: # Explicit cache flush, see bnc#350581 for details @@ -438,6 +436,33 @@ Progress->Finish(); return 1; } + + # these changes might require a restart of slapd + if ( $use_ldap_listener ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'yes'); + } + else + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAP', 'no'); + } + if ( $use_ldapi_listener ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'yes'); + } + else + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPI', 'no'); + } + if ( $use_ldaps_listener ) + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'yes'); + } + else + { + SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no'); + } + if( ! SCR->Execute('.ldapserver.commitChanges' ) ) { my $err = SCR->Error(".ldapserver"); @@ -1198,5 +1223,29 @@ return 0; } } + +BEGIN { $TYPEINFO {SetProtocolListenerEnabled} = ["function", "boolean", "string", "boolean" ]; } +sub SetProtocolListenerEnabled +{ + my ( $self, $protocol, $enabled ) = @_; + y2milestone("SetProtocolListenerEnabled $protocol $enabled"); + if ( $protocol eq "ldap" ) + { + $use_ldap_listener = $enabled; + } + elsif ( $protocol eq "ldapi" ) + { + $use_ldapi_listener = $enabled; + } + elsif ( $protocol eq "ldaps" ) + { + $use_ldaps_listener = $enabled; + } + else + { + return 0; + } + return 1; +} 1; # EOF Modified: trunk/ldap-server/src/tree_structure.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y…
============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Thu Jul 31 17:15:18 2008 @@ -154,6 +154,33 @@ { LdapServer::SetServiceEnabled( false ); } + + if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) ) + { + LdapServer::SetProtocolListenerEnabled( "ldap", true ); + } + else + { + LdapServer::SetProtocolListenerEnabled( "ldap", false ); + } + + if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldaps ), `Value ) ) + { + LdapServer::SetProtocolListenerEnabled( "ldaps", true ); + } + else + { + LdapServer::SetProtocolListenerEnabled( "ldaps", false ); + } + + if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) ) + { + LdapServer::SetProtocolListenerEnabled( "ldapi", true ); + } + else + { + LdapServer::SetProtocolListenerEnabled( "ldapi", false ); + } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49550 - in /trunk/ldap-server/src: LdapServer.pm tree_structure.ycp
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:14 2008 New Revision: 49550 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49550&view=rev
Log: honor protocol listener switches from sysconfig, support for configuring specific interfaces is still missing Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:14 2008 @@ -38,6 +38,14 @@ my $registerSlp = 0; my $useLdapiForConfig = 0; my %dbDefaults = (); + +my $use_ldapi_listener = 0; +my $use_ldaps_listener = 0; +my $use_ldap_listener = 0; +my $ldapi_interfaces = ""; +my $ldaps_interfaces = ""; +my $ldap_interfaces = ""; + my @defaultIndexes = ( { "name" => "objectclass", "eq" => YaST::YCP::Boolean(1) @@ -146,6 +154,14 @@ $serviceRunning = $isRunning; y2milestone("IsRunning: " . $isRunning . " IsEnabled " . $isEnabled); + $use_ldapi_listener = ( "yes" eq SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAPI') ); + $ldapi_interfaces = SCR->Read('.sysconfig.openldap.OPENLDAP_LDAPI_INTERFACES'); + + $use_ldaps_listener = ( "yes" eq SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAPS') ); + $ldaps_interfaces = SCR->Read('.sysconfig.openldap.OPENLDAP_LDAPS_INTERFACES'); + + $use_ldap_listener = ( "yes" eq SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAP') ); + $ldap_interfaces = SCR->Read('.sysconfig.openldap.OPENLDAP_LDAP_INTERFACES'); Progress->NextStage(); my $configBackend = SCR->Read('.sysconfig.openldap.OPENLDAP_CONFIG_BACKEND'); @@ -1160,5 +1176,27 @@ return YaST::YCP::Boolean(1); } +BEGIN { $TYPEINFO {GetProtocolListenerEnabled} = ["function", "boolean", "string" ]; } +sub GetProtocolListenerEnabled +{ + my ( $self, $protocol ) = @_; + y2milestone("GetProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener"); + if ( $protocol eq "ldap" ) + { + return $use_ldap_listener; + } + elsif ( $protocol eq "ldapi" ) + { + return $use_ldapi_listener; + } + elsif ( $protocol eq "ldaps" ) + { + return $use_ldaps_listener; + } + else + { + return 0; + } +} 1; # EOF Modified: trunk/ldap-server/src/tree_structure.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y…
============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Thu Jul 31 17:15:14 2008 @@ -95,6 +95,30 @@ UI::ChangeWidget( `fr_listener, `Enabled, false ); UI::ChangeWidget( `fr_firewall, `Enabled, false ); } + if ( LdapServer::GetProtocolListenerEnabled("ldap") ) + { + UI::ChangeWidget( `cb_interface_ldap, `Value, true ); + } + else + { + UI::ChangeWidget( `cb_interface_ldap, `Value, false ); + } + if ( LdapServer::GetProtocolListenerEnabled("ldaps") ) + { + UI::ChangeWidget( `cb_interface_ldaps, `Value, true ); + } + else + { + UI::ChangeWidget( `cb_interface_ldaps, `Value, false ); + } + if ( LdapServer::GetProtocolListenerEnabled("ldapi") ) + { + UI::ChangeWidget( `cb_interface_ldapi, `Value, true ); + } + else + { + UI::ChangeWidget( `cb_interface_ldapi, `Value, false ); + } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49549 - in /trunk/ldap-server/src: LdapServer.pm complex.ycp dialogs.ycp tree_structure.ycp
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:10 2008 New Revision: 49549 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49549&view=rev
Log: reworked startup procedure when back-config is used and slapd is not running Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/complex.ycp trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:10 2008 @@ -34,6 +34,7 @@ my $usesBackConfig = 0; my $slapdConfChanged = 0; my $serviceEnabled = 0; +my $serviceRunning = 1; my $registerSlp = 0; my $useLdapiForConfig = 0; my %dbDefaults = (); @@ -138,12 +139,13 @@ Progress->New("Initializing LDAP Server Configuration", "Blub", 3, $progressItems, $progressItems, ""); Progress->NextStage(); my $serviceInfo = Service->FullInfo("ldap"); + y2milestone("Serviceinfo: ". Data::Dumper->Dump([$serviceInfo])); my $isRunning = ( defined $serviceInfo->{"started"}) && ($serviceInfo->{"started"} == 0); # 0 == "running" - my $isEnabled = $serviceInfo->{"start"} && $serviceInfo->{"start"} > 0; + my $isEnabled = scalar(@{$serviceInfo->{"start"}}) > 0; $serviceEnabled = $isEnabled; - - y2milestone("Serviceinfo: ". Data::Dumper->Dump([$serviceInfo])); + $serviceRunning = $isRunning; y2milestone("IsRunning: " . $isRunning . " IsEnabled " . $isEnabled); + Progress->NextStage(); my $configBackend = SCR->Read('.sysconfig.openldap.OPENLDAP_CONFIG_BACKEND'); @@ -164,16 +166,26 @@ } else { - # LDAP Server not running. Use slapcat to import the config - y2milestone("Using slapcat to import configuration"); - my $rc = SCR->Execute('.target.bash_output', - "/usr/sbin/slapcat -F /etc/openldap/slapd.d -b cn=config" ); + # check if configuration exists + if (SCR->Read(".target.size", '/etc/openldap/slapd.d/cn=config.ldif') <= 0) + { + $slapdConfChanged = 0; + } + else + { + # LDAP Server not running. Can't read the configuration until + # 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])); +# 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 @@ -291,7 +303,7 @@ my $self = shift; y2milestone("LdapServer::Write"); my $ret = 1; - if ( ! $usesBackConfig ) + if ( ! $usesBackConfig || ! $slapdConfChanged ) { my $progressItems = [ _("Writing Startup Configuration"), _("Cleaning up config directory"), @@ -408,7 +420,7 @@ Progress->NextStage(); Service->Stop("ldap"); Progress->Finish(); - return 0; + return 1; } if( ! SCR->Execute('.ldapserver.commitChanges' ) ) { @@ -540,6 +552,12 @@ return 1; } +BEGIN { $TYPEINFO {ReadServiceRunning} = ["function", "boolean"]; } +sub ReadServiceRunning { + y2milestone("ReadServiceRunning $serviceRunning"); + return $serviceRunning; +} + BEGIN { $TYPEINFO {ReadSLPEnabled} = ["function", "boolean"]; } sub ReadSLPEnabled { y2milestone("ReadSLPEnabled"); Modified: trunk/ldap-server/src/complex.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/complex.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/complex.ycp (original) +++ trunk/ldap-server/src/complex.ycp Thu Jul 31 17:15:10 2008 @@ -160,16 +160,27 @@ y2milestone("OpenLDAP using backConfig: %1", hasBackconfig); y2milestone("OpenLDAP modifed config: %1", configModified); string configFile = "/etc/openldap/slapd.conf"; - if ( !hasBackconfig && configModified ) + if ( !hasBackconfig ) { - return `migrate; - + if ( configModified ) + { + return `migrate; + } + else + { + // Start new config wizward + LdapServer::InitDbDefaults(); + return `initial; + } } - else if (! configModified ) + else { - // Start new config wizward - LdapServer::InitDbDefaults(); - return `initial; + if (! configModified ) + { + // Start new config wizward + LdapServer::InitDbDefaults(); + return `initial; + } } return `next; Modified: trunk/ldap-server/src/dialogs.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Thu Jul 31 17:15:10 2008 @@ -110,7 +110,7 @@ { //create new item term widget = nil; - if (! LdapServer::ReadServiceEnabled() ) + if ( !LdapServer::ReadServiceEnabled() || !LdapServer::ReadServiceRunning() ) { if ( name != "daemon" ) { Popup::Error( _("The LDAP Server is disabled currently, no configuration changes possible.") ); @@ -408,7 +408,10 @@ //generate tree Wizard::DeleteTreeItems(); deleteDynamicTreeItems(); - generateDynamicTreeItems(); + if ( LdapServer::ReadServiceRunning() ) + { + generateDynamicTreeItems(); + } widget_tree = generateTree(); if( widget_tree == nil ) { Modified: trunk/ldap-server/src/tree_structure.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y…
============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Thu Jul 31 17:15:10 2008 @@ -1164,7 +1164,6 @@ y2debug( "generating database tree items" ); //generate database entries - y2milestone( "calling databases read handler" ); list<map<string,string> > dblist = LdapServer::GetDatabaseList(); integer i = 0; foreach( map<string,string> db, dblist, { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49548 - in /trunk/ldap-server/src: LdapServer.pm dialogs.ycp tree_structure.ycp widgets.ycp
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:05 2008 New Revision: 49548 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49548&view=rev
Log: - infrastructure for service settings - enable/disable service is working again - cleanup Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:05 2008 @@ -140,6 +140,7 @@ my $serviceInfo = Service->FullInfo("ldap"); my $isRunning = ( defined $serviceInfo->{"started"}) && ($serviceInfo->{"started"} == 0); # 0 == "running" my $isEnabled = $serviceInfo->{"start"} && $serviceInfo->{"start"} > 0; + $serviceEnabled = $isEnabled; y2milestone("Serviceinfo: ". Data::Dumper->Dump([$serviceInfo])); y2milestone("IsRunning: " . $isRunning . " IsEnabled " . $isEnabled); @@ -393,6 +394,22 @@ } Progress->Finish(); } else { + my $wasEnabled = Service->Enabled("ldap"); + if ( $wasEnabled && !$serviceEnabled ) + { + # service was disabled during this session, just disable the service + # in the system, stop it and ignore any configuration changes. + my $progressItems = [ _("Stopping LDAP Server"), + _("Disabling LDAP Server") + ]; + Progress->New("De-activating OpenLDAP Server", "", 2, $progressItems, $progressItems, ""); + Progress->NextStage(); + Service->Disable("ldap"); + Progress->NextStage(); + Service->Stop("ldap"); + Progress->Finish(); + return 0; + } if( ! SCR->Execute('.ldapserver.commitChanges' ) ) { my $err = SCR->Error(".ldapserver"); Modified: trunk/ldap-server/src/dialogs.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Thu Jul 31 17:15:05 2008 @@ -106,10 +106,18 @@ return true; } -void showTreeDialog( string name, boolean focus_tree ) +string showTreeDialog( string name, boolean focus_tree ) { //create new item - term widget = (term)widget_map[name,"widget"]:`Label( "Loading widget for item '"+name+"' failed." ); + term widget = nil; + if (! LdapServer::ReadServiceEnabled() ) + { + if ( name != "daemon" ) { + Popup::Error( _("The LDAP Server is disabled currently, no configuration changes possible.") ); + name = "daemon"; + } + } + widget = (term)widget_map[name,"widget"]:`Label( "Loading widget for item '"+name+"' failed." ); //get helps page string help_page = (string)widget_map[name,"help_page"]:name; @@ -121,6 +129,8 @@ Wizard::DisableBackButton(); if( focus_tree ) UI::SetFocus( `id( `wizardTree ) ); + + return name; } @@ -128,7 +138,7 @@ ** dialog functions ** **********************/ -term dlg_service = `HSquash( +term dlg_service_initial = `HSquash( `VBox( `Heading( _("General Settings") ), `VBox( @@ -172,7 +182,7 @@ map<string, any> firewall_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (firewall_settings); - Wizard::SetContentsButtons( caption, dlg_service, HELPS["service_dialog"]:"help not found", + Wizard::SetContentsButtons( caption, dlg_service_initial, HELPS["service_dialog"]:"help not found", Label::BackButton(), Label::NextButton() ); if( (boolean)defaults["serviceEnabled"]:true ) @@ -409,8 +419,8 @@ Wizard::CreateTree( widget_tree, _("Configuration:") ); //select&show current item + current_tree_item = showTreeDialog( current_tree_item, ( widget_tree == [] ) ? false : true ); Wizard::SelectTreeItem( current_tree_item ); - showTreeDialog( current_tree_item, ( widget_tree == [] ) ? false : true ); //initialize current dialog callHandler( current_tree_item, "cb_read" ); rebuild_widget_tree = false; @@ -436,10 +446,10 @@ continue; } - current_tree_item = new_item; - showTreeDialog( new_item, (ret == `wizardTree) ? true : false ); + current_tree_item = showTreeDialog( new_item, (ret == `wizardTree) ? true : false ); + Wizard::SelectTreeItem( current_tree_item ); - callHandler( new_item, "cb_read" ); + callHandler( current_tree_item, "cb_read" ); } else if( is( ret, symbol ) ) Modified: trunk/ldap-server/src/tree_structure.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y…
============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Thu Jul 31 17:15:05 2008 @@ -81,6 +81,58 @@ UI::ChangeWidget( `pb_delete, `Enabled, false ); } +define boolean cb_read_daemon() +``{ + y2milestone("calling read handler for item \"daemon\""); + boolean enabled = LdapServer::ReadServiceEnabled(); + if ( enabled ) + { + UI::ChangeWidget( `rb_service_enable, `CurrentButton, `rb_yes ); + } + else + { + UI::ChangeWidget( `rb_service_enable, `CurrentButton, `rb_no ); + UI::ChangeWidget( `fr_listener, `Enabled, false ); + UI::ChangeWidget( `fr_firewall, `Enabled, false ); + } + return true; +} + +define boolean cb_input_daemon() +``{ + y2milestone("calling input handler for item \"daemon\""); + y2milestone("Handlercmd = %1", handler_cmd); + + if ( handler_cmd == `rb_no ) // service was just disabled + { + UI::ChangeWidget( `fr_listener, `Enabled, false ); + UI::ChangeWidget( `fr_firewall, `Enabled, false ); + } + else if ( handler_cmd == `rb_yes ) // service was just disabled + { + UI::ChangeWidget( `fr_listener, `Enabled, true ); + UI::ChangeWidget( `fr_firewall, `Enabled, true ); + } + + return true; +} + +define boolean cb_write_daemon() +``{ + y2milestone("calling write handler for item \"daemon\""); + + symbol serviceEnabled = (symbol)UI::QueryWidget(`id(`rb_service_enable), `CurrentButton); + if ( serviceEnabled == `rb_yes ) + { + LdapServer::SetServiceEnabled( true ); + } + else + { + LdapServer::SetServiceEnabled( false ); + } + return true; +} + define boolean cb_read_schema() ``{ y2milestone( "calling schema read handler" ); @@ -89,24 +141,6 @@ return true; } -integer find_pos( list<string> l, string s ) -{ - y2debug( "-------------- starting find_pos ----------------" ); - y2debug( "searching in list '%1'", l ); - y2debug( "for string '%1'", s ); - y2debug( "size( l ) is '%1'", size( l ) ); - if( size( l ) == 0 ) return -1; - integer i = 0; - integer ret = -1; - foreach( string str, l, { - y2debug( "comparing str '%1' with s '%2'", str, s ); - y2debug( "current position is '%1'", i ); - if( str == s ) ret = i; - i = i + 1; - } ); - return ret; -} - define boolean cb_input_schema() ``{ y2milestone( "calling schema input handler" ); @@ -1005,7 +1039,10 @@ ], "daemon" : $[ "name" : _("Startup Configuration"), - "widget" : dlg_service_new + "widget" : dlg_service, + "cb_read" : ``( cb_read_daemon() ), + "cb_input" : ``( cb_input_daemon() ), + "cb_write" : ``( cb_write_daemon() ) ], "global" : $[ "children" : [ "g_loglevel", "g_allow", "g_tls" ], Modified: trunk/ldap-server/src/widgets.ycp URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=…
============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Thu Jul 31 17:15:05 2008 @@ -19,15 +19,16 @@ ]; map<string, any> fw_widget = CWMFirewallInterfaces::CreateOpenFirewallWidget (firewall_settings); - term dlg_service_new = `Top( + term dlg_service = `Top( `VBox( `VBox( `Frame( _("&Start LDAP Server"), `VBox( `RadioButtonGroup( + `id( `rb_service_enable ), `VBox( - `Left( `RadioButton( `id( `rb_no ), `opt( `notify ), Label::NoButton(), !LdapServer::ReadServiceEnabled() ) ), - `Left( `RadioButton( `id( `rb_yes ), `opt( `notify ), Label::YesButton(), LdapServer::ReadServiceEnabled() ) ) + `Left( `RadioButton( `id( `rb_no ), `opt( `notify ), Label::NoButton() ) ), + `Left( `RadioButton( `id( `rb_yes ), `opt( `notify ), Label::YesButton(), true ) ) ) ), // `Left( `CheckBox( `id( `cb_register_slp ), _("Register at an &SLP Daemon"), LdapServer::ReadSLPEnabled() )), @@ -37,7 +38,8 @@ ), `VSpacing(), `VBox( - `Frame( _("Protocol Listeners"), + `Frame(`id ( `fr_listener ), + _("Protocol Listeners"), `VBox( `Left( `HBox( @@ -65,7 +67,8 @@ ), `VSpacing(), `VBox( - `Frame( _("Firewall Settings"), + `Frame( `id( `fr_firewall ), + _("Firewall Settings"), `VBox( fw_widget["custom_widget"]:`Empty(), `HStretch() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49547 - /trunk/ldap-server/src/LdapServer.pm
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:15:01 2008 New Revision: 49547 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49547&view=rev
Log: Add ppolicy.schema when first ppolicy overlay is configured Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:01 2008 @@ -935,11 +935,24 @@ { my ($self, $dbIndex, $ppolicy ) = @_; y2milestone("AddPasswordPolicy: ".Data::Dumper->Dump([$ppolicy])." ". scalar(keys %{$ppolicy}) ); + if ( 0 < scalar(keys %{$ppolicy}) ) { $ppolicy->{'hashClearText'} = YaST::YCP::Boolean($ppolicy->{'hashClearText'}); $ppolicy->{'useLockout'} = YaST::YCP::Boolean($ppolicy->{'useLockout'}); + + # slapo-ppolicy requires ppolicy schema to be loaded + my @schema = $self->GetSchemaList(); + if ( grep( !/^ppolicy$/, @schema ) ) + { + my $rc = $self->AddSchemaToSchemaList("/etc/openldap/schema/ppolicy.schema"); + if ( ! $rc ) + { + return $rc; + } + } } + if ( ! SCR->Write(".ldapserver.database.{".$dbIndex."}.ppolicy", $ppolicy ) ) { my $err = SCR->Error(".ldapserver"); $self->SetError( $err->{'summary'}, $err->{'description'} ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49546 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc
by rhafer@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rhafer Date: Thu Jul 31 17:14:57 2008 New Revision: 49546 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49546&view=rev
Log: Handle LDAPExceptions thrown during .ldap.commitChanges Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/LdapServer.pm URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re…
============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:14:57 2008 @@ -393,7 +393,13 @@ } Progress->Finish(); } else { - SCR->Execute('.ldapserver.commitChanges' ); + if( ! SCR->Execute('.ldapserver.commitChanges' ) ) + { + my $err = SCR->Error(".ldapserver"); + y2error($err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return 0; + } } sleep(1); $configured = $ret; Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi…
============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Thu Jul 31 17:14:57 2008 @@ -269,25 +269,35 @@ } else if ( path->component_str(0) == "commitChanges" ) { - if ( globals ) - olc.updateEntry( *globals ); + try { + if ( globals ) + olc.updateEntry( *globals ); - OlcSchemaList::const_iterator j; - for ( j = schema.begin(); j != schema.end() ; j++ ) - { - olc.updateEntry(**j); - } - OlcDatabaseList::const_iterator i; - for ( i = databases.begin(); i != databases.end() ; i++ ) - { - olc.updateEntry(**i); - OlcOverlayList overlays = (*i)->getOverlays(); - OlcOverlayList::const_iterator k; - for ( k = overlays.begin(); k != overlays.end(); k++ ) + OlcSchemaList::const_iterator j; + for ( j = schema.begin(); j != schema.end() ; j++ ) { - y2milestone("Update overlay: %s", (*k)->getDn().c_str() ); - olc.updateEntry(**k); + olc.updateEntry(**j); } + OlcDatabaseList::const_iterator i; + for ( i = databases.begin(); i != databases.end() ; i++ ) + { + olc.updateEntry(**i); + OlcOverlayList overlays = (*i)->getOverlays(); + OlcOverlayList::const_iterator k; + for ( k = overlays.begin(); k != overlays.end(); k++ ) + { + y2milestone("Update overlay: %s", (*k)->getDn().c_str() ); + olc.updateEntry(**k); + } + } + } catch ( LDAPException e ) { + std::string errstring = "Error while commiting changes to config database"; + std::string details = e.getResultMsg() + ": " + e.getServerMsg(); + + lastError->add(YCPString("summary"), + YCPString(errstring) ); + lastError->add(YCPString("description"), YCPString( details ) ); + return YCPBoolean(false); } } else if ( path->component_str(0) == "addRootSaslRegexp" ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
[yast-commit] r49545 - in /trunk/gtk: ChangeLog src/YGPackageSelector.cc src/ygtksteps.c src/ygtkwizard.c src/ygtkwizard.h src/yzyppwrapper.cc
by rpmcruz@svn.opensuse.org
31 Jul '08
31 Jul '08
Author: rpmcruz Date: Thu Jul 31 15:41:53 2008 New Revision: 49545 URL:
http://svn.opensuse.org/viewcvs/yast?rev=49545&view=rev
Log: * src/YGPackageSelector.cc: online update was broken. * src/yzyppwrapper.cc: only show relevant patches. * src/ygtkwizard.h/c: added information background drawing hook. Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/ygtksteps.c trunk/gtk/src/ygtkwizard.c trunk/gtk/src/ygtkwizard.h trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=49545&r1=49544…
============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Jul 31 15:41:53 2008 @@ -1,3 +1,10 @@ +2008-07-31 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc: online update was broken. + * src/yzyppwrapper.cc: only show relevant patches. + + * src/ygtkwizard.h/c: added information background drawing hook. + 2008-07-30 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/yzyppwrapper.h/.cc: add attributes arch to Version and url to Modified: trunk/gtk/src/YGPackageSelector.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev…
============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Jul 31 15:41:53 2008 @@ -816,6 +816,9 @@ gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0); + ygtk_wizard_set_information_expose_hook (vbox, &vbox->allocation); + ygtk_wizard_set_information_expose_hook (m_entries_box, &m_entries_box->allocation); + int width = YGUtils::getCharsWidth (vbox, 25); gtk_widget_set_size_request (vbox, width, -1); gtk_widget_show_all (vbox); @@ -1075,15 +1078,17 @@ Categories (Collections::Listener *listener, bool patch_mode) : StoreView (listener), m_patchMode (patch_mode), m_rpmGroups (false) { - GtkWidget *check = gtk_check_button_new_with_label (_("Detailed")); - YGUtils::setWidgetFont (GTK_BIN (check)->child, - PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); - gtk_widget_set_tooltip_text (check, - _("Group by the PackageKit-based filter or straight from the actual " - "RPM information.")); - g_signal_connect (G_OBJECT (check), "toggled", - G_CALLBACK (rpm_groups_toggled_cb), this); - gtk_box_pack_start (GTK_BOX (m_box), check, FALSE, TRUE, 0); + if (!m_patchMode) { + GtkWidget *check = gtk_check_button_new_with_label (_("Detailed")); + YGUtils::setWidgetFont (GTK_BIN (check)->child, + PANGO_WEIGHT_NORMAL, PANGO_SCALE_SMALL); + gtk_widget_set_tooltip_text (check, + _("Group by the PackageKit-based filter or straight from the actual " + "RPM information.")); + g_signal_connect (G_OBJECT (check), "toggled", + G_CALLBACK (rpm_groups_toggled_cb), this); + gtk_box_pack_start (GTK_BOX (m_box), check, FALSE, TRUE, 0); + } build (m_rpmGroups, !m_rpmGroups, false); } @@ -1107,12 +1112,12 @@ Ypp::Node *first_category; Ypp::Package::Type type = m_patchMode ? Ypp::Package::PATCH_TYPE : Ypp::Package::PACKAGE_TYPE; - if (!m_rpmGroups) + if (!m_rpmGroups && !m_patchMode) first_category = Ypp::get()->getFirstCategory2 (type); else first_category = Ypp::get()->getFirstCategory (type); inner::populate (store, NULL, first_category, this); - if (!m_rpmGroups) { + if (!m_rpmGroups && !m_patchMode) { GtkTreeView *view = GTK_TREE_VIEW (m_view); GtkTreeIter iter; gtk_tree_store_append (store, &iter, NULL); @@ -1142,7 +1147,7 @@ query->setIsSuggested (true); else { Ypp::Node *node = (Ypp::Node *) ptr; - if (m_rpmGroups) + if (m_rpmGroups || m_patchMode) query->addCategory (node); else query->addCategory2 (node); @@ -1474,8 +1479,8 @@ else { gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Groups")); gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Patterns")); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Repositories")); } + gtk_combo_box_append_text (GTK_COMBO_BOX (m_type), _("Repositories")); gtk_combo_box_set_active (GTK_COMBO_BOX (m_type), 0); g_signal_connect_after (G_OBJECT (m_type), "changed", G_CALLBACK (type_changed_cb), this); Modified: trunk/gtk/src/ygtksteps.c URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtksteps.c?rev=49545&r1…
============================================================================== --- trunk/gtk/src/ygtksteps.c (original) +++ trunk/gtk/src/ygtksteps.c Thu Jul 31 15:41:53 2008 @@ -167,25 +167,8 @@ static gboolean ygtk_steps_expose_event (GtkWidget *widget, GdkEventExpose *event) { GtkStyle *style = gtk_widget_get_style (widget); - - // background - cairo_t *cr = gdk_cairo_create (widget->window); - - int x, y, w, h; - x = widget->allocation.x; y = widget->allocation.y; - w = widget->allocation.width; h = widget->allocation.height; - - cairo_pattern_t *pattern = cairo_pattern_create_linear (x, y, x, y+h); - cairo_pattern_add_color_stop_rgba (pattern, 0, 1, 1, 1, 1); - cairo_pattern_add_color_stop_rgba (pattern, 1, 1, 1, 1, 0); - cairo_set_source (cr, pattern); - cairo_rectangle (cr, x, y, w, h); - cairo_fill (cr); - cairo_pattern_destroy (pattern); - cairo_destroy (cr); - // content - x = widget->allocation.x + BORDER; y = widget->allocation.y + BORDER; + int x = widget->allocation.x + BORDER, y = widget->allocation.y + BORDER; YGtkSteps *steps = YGTK_STEPS (widget); int i; for (i = 0; i < ygtk_steps_total (steps); i++) { Modified: trunk/gtk/src/ygtkwizard.c URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.c?rev=49545&r…
============================================================================== --- trunk/gtk/src/ygtkwizard.c (original) +++ trunk/gtk/src/ygtkwizard.c Thu Jul 31 15:41:53 2008 @@ -549,6 +549,28 @@ gtk_paned_pack2 (GTK_PANED (wizard->m_pane), widget, TRUE, TRUE); } +static gboolean ygtk_wizard_set_information_expose_cb (GtkWidget *widget, GdkEventExpose *event, + GtkAllocation *alloc) +{ + cairo_t *cr = gdk_cairo_create (widget->window); + int x = alloc->x, y = alloc->y, w = alloc->width, h = alloc->height; + cairo_pattern_t *pattern = cairo_pattern_create_linear (x, y, x, y+h); + cairo_pattern_add_color_stop_rgba (pattern, 0, 1, 1, 1, 1); + cairo_pattern_add_color_stop_rgba (pattern, 1, 1, 1, 1, 0); + cairo_set_source (cr, pattern); + cairo_rectangle (cr, x, y, w, h); + cairo_fill (cr); + cairo_pattern_destroy (pattern); + cairo_destroy (cr); + return FALSE; +} + +void ygtk_wizard_set_information_expose_hook (GtkWidget *widget, GtkAllocation *alloc) +{ + g_signal_connect (G_OBJECT (widget), "expose-event", + G_CALLBACK (ygtk_wizard_set_information_expose_cb), alloc); +} + void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget) { gtk_box_pack_start (GTK_BOX (wizard->m_contents_box), widget, FALSE, TRUE, 0); @@ -565,6 +587,7 @@ wizard->m_steps = ygtk_steps_new(); gtk_widget_show (wizard->m_steps); ygtk_wizard_set_information_widget (wizard, wizard->m_steps); + ygtk_wizard_set_information_expose_hook (wizard->m_steps, &wizard->m_steps->allocation); } void ygtk_wizard_enable_tree (YGtkWizard *wizard) Modified: trunk/gtk/src/ygtkwizard.h URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkwizard.h?rev=49545&r…
============================================================================== --- trunk/gtk/src/ygtkwizard.h (original) +++ trunk/gtk/src/ygtkwizard.h Thu Jul 31 15:41:53 2008 @@ -115,6 +115,7 @@ // the given one (you may pass NULL to just remove current child) void ygtk_wizard_set_child (YGtkWizard *wizard, GtkWidget *widget); void ygtk_wizard_set_information_widget (YGtkWizard *wizard, GtkWidget *widget); +void ygtk_wizard_set_information_expose_hook (GtkWidget *widget, GtkAllocation *alloc); void ygtk_wizard_set_control_widget (YGtkWizard *wizard, GtkWidget *widget); // commands Modified: trunk/gtk/src/yzyppwrapper.cc URL:
http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4954…
============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Thu Jul 31 15:41:53 2008 @@ -80,7 +80,9 @@ Ypp::Node *getFirst() { - return (Ypp::Node *) root->children->data; + if (root->children) + return (Ypp::Node *) root->children->data; + return NULL; } Ypp::Node *add (const std::string &tree_str, const char *icon) @@ -1768,6 +1770,8 @@ ZyppPatch patch = tryCastToZyppPatch (object); if (!patch) continue; + if ((*it)->candidateObj() && !(*it)->candidateObj().isRelevant()) + continue; category = addCategory (type, patch->category()); break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org
1
0
0
0
← Newer
1
2
3
4
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200