February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67430 - /trunk/installation/src/clients/inst_release_notes.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 11:46:23 2012 New Revision: 67430 URL: http://svn.opensuse.org/viewcvs/yast?rev=67430&view=rev Log: improve layout (use MarginBox), bnc #550610 Modified: trunk/installation/src/clients/inst_release_notes.ycp Modified: trunk/installation/src/clients/inst_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_re… ============================================================================== --- trunk/installation/src/clients/inst_release_notes.ycp (original) +++ trunk/installation/src/clients/inst_release_notes.ycp Wed Feb 15 11:46:23 2012 @@ -192,23 +192,19 @@ string caption = _("Release Notes"); term relnoteslayout = nil; - term relnotesscreen = `VBox ( - `HBox( - `HWeight( 20, `Empty() ), - // combobox - `HWeight( 60, `VBox(`Left ( - `ReplacePoint ( - `id(`lang_rp), - `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) - ) - ), - `ReplacePoint(`id(`content_rp), - `RichText (`id (`relnotescontent), "") - ) - )), - `HWeight( 20,`Empty() ) - ) - ); + term relnotesscreen = `MarginBox ( 2.0, 0.2, + // combobox + `VBox(`Left ( + `ReplacePoint ( + `id(`lang_rp), + `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) + ) + ), + `ReplacePoint(`id(`content_rp), + `RichText (`id (`relnotescontent), "") + ) + ) + ); // if there are more products installed, show them in tabs or with // combo box, bnc #359137 (do not show tab for one product) @@ -268,7 +264,7 @@ boolean UsePlainText ( string file ) { boolean ret = UI::TextMode() && FileUtils::Exists(file); if (ret) - y2milestone("Found .txt file with release notes, will use it for TUI."); + y2milestone("Found .txt file \"%1\" with release notes, will use it for TUI.", file); return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67429 - /tags/stable-2_22_0/iscsi-client/
by fehr＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: fehr Date: Wed Feb 15 11:37:44 2012 New Revision: 67429 URL: http://svn.opensuse.org/viewcvs/yast?rev=67429&view=rev Log: Created tag stable-2_22_0 for iscsi-client Added: tags/stable-2_22_0/iscsi-client/ - copied from r67428, trunk/iscsi-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67428 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes
by fehr＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: fehr Date: Wed Feb 15 11:36:25 2012 New Revision: 67428 URL: http://svn.opensuse.org/viewcvs/yast?rev=67428&view=rev Log: version 2.22.0 Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=67428&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed Feb 15 11:36:25 2012 @@ -1 +1 @@ -2.21.9 +2.22.0 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Feb 15 11:36:25 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 15 11:36:05 CET 2012 - fehr(a)suse.de + +- version 2.22.0 + +------------------------------------------------------------------- Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de - change detection of qla iscsi devices (bnc#745201) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67427 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 20:46:03 2012 New Revision: 67427 URL: http://svn.opensuse.org/viewcvs/yast?rev=67427&view=rev Log: - fixed exit code check (missing from bnc #561876) Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 14 20:46:03 2012 @@ -489,7 +489,8 @@ ); integer ret = (integer)SCR::Execute (.target.bash, command); y2milestone ("Running command %1 with exit code %2", command, ret); - if (ret == 5){ + if (ret == 8) + { string popup = sformat (_("Device %1 is not formatted. Format device now? If you want to format multiple devices in parallel, press 'Cancel' and select 'Perform Action', 'Format' later on. -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67426 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 20:44:53 2012 New Revision: 67426 URL: http://svn.opensuse.org/viewcvs/yast?rev=67426&view=rev Log: - use switch statement Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Tue Feb 14 20:44:53 2012 @@ -399,6 +399,7 @@ UI::CloseDialog (); } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -406,51 +407,72 @@ */ void ReportActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: No device found for <ccwid>."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not change state of the device."), id)); - else if (ret == 5) + break; + + case 5: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification _("%1: Device is not a DASD."), id)); - else if (ret == 6) + break; + + case 6: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not load module."), id)); - else if (ret == 7) - //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + break; + + case 7: + // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification _("%1: Failed to activate DASD."), id)); - else if (ret == 8) - //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + break; + + case 8: + // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification _("%1: DASD is not formatted."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Activate selected Disks * @param channel string Name of the disk to activate Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 14 20:44:53 2012 @@ -328,6 +328,7 @@ UI::CloseDialog(); } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -335,51 +336,74 @@ */ void ReportActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: No device found for <ccwid>."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: WWPN invalid."), id)); - else if (ret == 5) + break; + + case 5: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not activate WWPN for adapter %1."), id)); - else if (ret == 6) + break; + + case 6: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not activate ZFCP device."), id)); - else if (ret == 7) + break; + + case 7: Report::Error (sformat ( // error report, %1 is device identification _("%1: SCSI disk could not be deactivated."), id)); - else if (ret == 8) + break; + + case 8: Report::Error (sformat ( // error report, %1 is device identification _("%1: ZFCP LUN could not be unregistered."), id)); - else if (ret == 9) + break; + + case 9: Report::Error (sformat ( // error report, %1 is device identification _("%1: ZFCP WWPN could not be unregistered."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -387,39 +411,56 @@ */ void ReportControllerActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: Device <ccwid> does not exist."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: Module zfcp could not be loaded."), id)); - else if (ret == 5) + break; + + case 5: Report::Error (sformat ( // error report, %1 is device identification _("%1: Adapter status could not be changed."), id)); - else if (ret == 6) + break; + + case 6: Report::Error (sformat ( // error report, %1 is device identification _("%1: WWPN ports still active."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Activate a disk * @param channel string channel id -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67425 - in /trunk/s390/src: dasd/wizards.ycp zfcp/wizards.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 11:41:44 2012 New Revision: 67425 URL: http://svn.opensuse.org/viewcvs/yast?rev=67425&view=rev Log: - use correct CloseDialog function Modified: trunk/s390/src/dasd/wizards.ycp trunk/s390/src/zfcp/wizards.ycp Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/dasd/dialogs.ycp"; + /** * Whole configuration of controller * @return symbol MainDASDSequence */ -symbol MainDASDSequence () { +symbol MainDASDSequence() +{ map aliases = $[ - "main" : ``(DASDDialog ()), - "add" : ``(AddDASDDiskDialog ()) + "main" : ``(DASDDialog()), + "add" : ``(AddDASDDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any DASDSequence() { - +any DASDSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainDASDSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any DASDAutoSequence() { - +any DASDAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainDASDSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/zfcp/dialogs.ycp"; + /** * Main dialog * @return symbol dialog */ -symbol MainZFCPSequence () { +symbol MainZFCPSequence() +{ map aliases = $[ - "main" : ``(ZFCPDialog ()), - "add" : ``(AddZFCPDiskDialog ()) + "main" : ``(ZFCPDialog()), + "add" : ``(AddZFCPDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any ZFCPSequence() { - +any ZFCPSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainZFCPSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any ZFCPAutoSequence() { - +any ZFCPAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainZFCPSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67424 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:19:00 2012 New Revision: 67424 URL: http://svn.opensuse.org/viewcvs/yast?rev=67424&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:19:00 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=… ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Mon Feb 13 18:19:00 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67423 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:18:46 2012 New Revision: 67423 URL: http://svn.opensuse.org/viewcvs/yast?rev=67423&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:18:46 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Mon Feb 13 18:18:46 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67422 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:18:31 2012 New Revision: 67422 URL: http://svn.opensuse.org/viewcvs/yast?rev=67422&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:18:31 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Mon Feb 13 18:18:31 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67421 - /tags/stable-2_22_1/ncurses/
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 14:06:07 2012 New Revision: 67421 URL: http://svn.opensuse.org/viewcvs/yast?rev=67421&view=rev Log: Created tag stable-2_22_1 for ncurses Added: tags/stable-2_22_1/ncurses/ - copied from r67420, trunk/ncurses/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0