August 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r49577 - in /trunk/storage/storage/src: include/custom_part_dialogs.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:15:03 2008 New Revision: 49577 URL: http://svn.opensuse.org/viewcvs/yast?rev=49577&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 1 15:15:03 2008 @@ -1477,118 +1477,6 @@ }; -define term TargetShowBarGraph( map target, string dev ) - ``{ - list partitions_size = []; - list partitions_text = []; - integer sum_used = 0; - integer cyl_size = target["cyl_size"]:1; - integer cyl_count = target["cyl_count"]:1; - integer min_size = tointeger( cyl_count / 8 ); - - - y2milestone( " target %1" ,target ); - y2milestone( " parts %1", target["partitions"]:[] ); - - foreach( map part, target["partitions"]:[], - ``{ - if( part["type"]:`primary != `extended ) - { - integer part_size = part["region",1]:0; - string part_size_str = ""; - - part_size_str = ByteToHumanString(part_size * cyl_size); - - sum_used = sum_used + part_size; - if( part_size < min_size ) - part_size = min_size; - - partitions_size = add( partitions_size , part_size); - - string part_text = part["mount"]:""; - - if( part_text == "" || part_text == nil ) - part_text = dev + sformat("%1", part["nr"]:(any)0); - - part_text = part_text + "\n" + part_size_str; - - partitions_text = add( partitions_text, part_text ); - } - }); - - integer free = cyl_count - sum_used; - - if( free > 0 ) - { - if( free > min_size ) - partitions_size = add( partitions_size, free ); - else partitions_size = add( partitions_size, min_size ); - // label text - partitions_text = add( partitions_text, _("free")); - } - - if( Mode::test () ) - { - y2milestone(" partitions_size : %1", partitions_size); - y2milestone(" partitions_text : %1", partitions_text); - } - - return `BarGraph(`opt(`vstretch), partitions_size , partitions_text ); - }; - - - -define boolean TargetAllocationDlg( map target, string dev) - ``{ - if( ! UI::HasSpecialWidget(`BarGraph) ) - { - // %1 is a disk device, example: You have selected the disk /dev/hda, but can only edit a partition like /dev/hda11, /dev/hda2, - Popup::Warning(sformat(_("\n You have selected the disk %1, but you can \n only edit a partition like %11, %12, ... \n"), dev)); - } - else - { - UI::OpenDialog(`opt(`decorated ), - `VBox( - `VSpacing(1), - `Left( `Heading( dev + ":")), - `VSpacing(1), - `VStretch(), - `HSpacing(80), - TargetShowBarGraph(target ,dev), - `VStretch(), - `VSpacing(1), - `HBox( - `PushButton(`id(`close), Label::CloseButton() ) - ) - )); - - UI::UserInput(); - UI::CloseDialog(); - } - - return true; - }; - - - - -define boolean DDZeroPartitionTable( string del_dev, integer size_k ) - ``{ - // popup text - if( Popup::YesNo(sformat(_("CAUTION -If you delete the partition table and disk label of -device %1, data on this device will be lost. - -Really do this? -"), del_dev))) - { - Storage::DeletePartitionTable(del_dev,size_k); - return true; - } - return false; - }; - - symbol ReallyInstPrepdisk() { symbol ret = `none; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 15:15:03 2008 @@ -2577,7 +2577,6 @@ } else { - TargetAllocationDlg(tg[id]:$[], id ); } } else if( part["type"]:`unknown == `lvm ) @@ -2821,18 +2820,6 @@ // Delete partition table and disk label ///////////////////////////////////////////////////////////// - if( ret == `delete_parttable ) - { - string ddev = ChooseDisk( tg, - // heading text - _("Delete Partition Table"), `delete ); - // not cancel - if( ddev != nil ) - { - DDZeroPartitionTable( ddev, tg[ddev,"size_k"]:0 ); - } - } - if( Arch::s390 () && ret==`dasdfmt ) { string id = (string)UI::QueryWidget(`id(`table), `CurrentItem); -- 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] r49576 - in /trunk/storage: storage/src/Makefile.am storage/src/inst_lvm_lv.ycp storage/src/inst_lvm_pv.ycp yast2-storage.spec.in
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 15:09:15 2008 New Revision: 49576 URL: http://svn.opensuse.org/viewcvs/yast?rev=49576&view=rev Log: - removed obsolete files Removed: trunk/storage/storage/src/inst_lvm_lv.ycp trunk/storage/storage/src/inst_lvm_pv.ycp Modified: trunk/storage/storage/src/Makefile.am trunk/storage/yast2-storage.spec.in Modified: trunk/storage/storage/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/Makefile.am?… ============================================================================== --- trunk/storage/storage/src/Makefile.am (original) +++ trunk/storage/storage/src/Makefile.am Fri Aug 1 15:09:15 2008 @@ -10,8 +10,6 @@ inst_custom_part.ycp \ inst_disk.ycp \ inst_do_resize.ycp \ - inst_lvm_lv.ycp \ - inst_lvm_pv.ycp \ inst_disk_proposal.ycp \ inst_prepdisk.ycp \ inst_resize_ui.ycp \ Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Aug 1 15:09:15 2008 @@ -46,10 +46,8 @@ %dir @yncludedir@/partitioning @yncludedir@/partitioning/*.ycp @clientdir@/inst_custom_part.ycp -@clientdir@/inst_lvm_lv.ycp @clientdir@/inst_resize_ui.ycp @clientdir@/inst_disk.ycp -@clientdir@/inst_lvm_pv.ycp @clientdir@/inst_target_part.ycp @clientdir@/inst_do_resize.ycp @clientdir@/inst_disk_proposal.ycp -- 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] r49575 - in /trunk/storage/storage/src: include/ep-lvm-lib.ycp include/lvm_pv_lib.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 14:59:18 2008 New Revision: 49575 URL: http://svn.opensuse.org/viewcvs/yast?rev=49575&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Fri Aug 1 14:59:18 2008 @@ -44,7 +44,10 @@ if (size(unused_pvs) < 1) { - Error(_("There are not enough suitable unused devices to create a volume group.")); + Error(_("There are not enough suitable unused devices to create a volume group. + +To use LVM, at least one unused partition of type 0x8e (or 0x83) or one unused +RAID device is required. Change your partition table accordingly.")); return; } Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Fri Aug 1 14:59:18 2008 @@ -316,24 +316,6 @@ return( ret ); } -define boolean check_lvm_possible( map<string,map> targetMap ) - ``{ - boolean possible_part_found = size(get_possible_pvs(targetMap))>0; - if( !possible_part_found ) - { - // Translators: the text 'do not format' must match the label in the corresponding popup! - Popup::Message(_("To use LVM, at least one partition of type 0x8e (or 0x83) -is required. Change your partition table accordingly. -In most cases, this can be done in the following way: -click 'Create', select 'Do not format', and set the File System ID to 0x8e. -")); - } - else if( Mode::normal() ) - { - possible_part_found = Package::InstallAll( ["lvm2"] ); - } - return possible_part_found; - } boolean check_vgname_dev( string vgname ) { Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 14:59:18 2008 @@ -2903,85 +2903,6 @@ } } - ///////////////////////////////////////////////////////////// - // REREAD - ///////////////////////////////////////////////////////////// - - if (ret == `reread) - { - boolean ret2 = true; - - if( ask_reread ) - // popup text - ret2 = Popup::YesNo(_("Rereading the partition table cancels all current changes. Really reread the partition table?")); - - if( ret2 ) - { - Storage::ReReadTargetMap(); - } - } - - - ///////////////////////////////////////////////////////////// - // Raid - ///////////////////////////////////////////////////////////// - - if( ret == `raid_wizard ) - { - if( !check_raid_possible( tg )) - { - ret = `again; - continue; - } - } - - if( ret == `loop_edit || ret == `loop_create ) - { - string id = (string)UI::QueryWidget( `id(`table), `CurrentItem ); - Storage::SetWizardKey( id ); - if( ret == `loop_edit ) - { - if( search( id, "/dev/loop" )!=0 ) - { - // popup text - Popup::Message( _("Select a loop device entry.") ); - ret = `again; - continue; - } - } - LoopSetup( ret==`loop_edit ); - if( ret==`loop_create ) - { - map dev = Storage::GetDisk( Storage::GetTargetMap(), "/dev/loop" ); - UI::ReplaceWidget( `id(`loop_button), - LoopButton(size(dev["partitions"]:[])) ); - } - } - - if( ret == `nfs || ret == `nfs_edit ) - { - string id = (string)UI::QueryWidget( `id(`table), `CurrentItem ); - Storage::SetWizardKey( id ); - NfsSetup( ret == `nfs_edit ); - } - - ///////////////////////////////////////////////////////////// - // LVM - ///////////////////////////////////////////////////////////// - - if (ret == `lvm) - { - if( !check_lvm_possible( tg ) ) - { - ret = `again; - continue; - } - else if( Mode::normal () ) - { - Package::InstallAll( ["lvm2"] ); - } - } - ///////////////////////////////////////////////////////////// // Adapt mount points from existing /etc/fstab ///////////////////////////////////////////////////////////// -- 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] r49574 - /trunk/storage/storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 14:46:54 2008 New Revision: 49574 URL: http://svn.opensuse.org/viewcvs/yast?rev=49574&view=rev Log: - use `HelpText option Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Fri Aug 1 14:46:54 2008 @@ -364,32 +364,30 @@ helptext = helptext + add_help ; }); - UI::OpenDialog( `opt(`decorated), - `HBox( - `HWeight(4, `RichText( helptext )), - `HWeight(7, - `VBox( - `HSpacing(50), - // heading text - `Left(`Heading(_("File system options:"))), - `VStretch(), - `VSpacing(1), - `HBox( - `HStretch(), - `HSpacing(1), - contents, - `HStretch(), - `HSpacing(1)), - `VSpacing(1), - `VStretch(), - `HBox( - `Bottom(`PushButton(`id(`ok), - `opt(`default), - Label::OKButton())), - `Bottom( - `PushButton(`id(`cancel), - Label::CancelButton()))) - )))); + UI::OpenDialog(`opt(`decorated), + `VBox( + `HSpacing(50), + // heading text + `Left(`Heading(_("File system options:"))), + `VStretch(), + `VSpacing(1), + `HBox( + `HStretch(), + `HSpacing(1), + contents, + `HStretch(), + `HSpacing(1)), + `VSpacing(1), + `VStretch(), + `HBox( + `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), + `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()))) + ) + ) + ); + + UI::ChangeWidget(`help, `HelpText, helptext); foreach(any query_key, map<string, any> option_map, fs_options, ``{ @@ -620,32 +618,30 @@ old_state[opt_list[size(opt_list)-1,`query_key]:""] = arb_opt; y2milestone( "FstabOptions old_state=%1", old_state ); - UI::OpenDialog( `opt(`decorated), - `VBox ( - `HSpacing(50), - // heading text - `Left(`Heading(_("Fstab options:"))), - `VStretch(), - `VSpacing(1), - `HBox(`HStretch(), - `HSpacing(1), - contents, - `HStretch(), - `HSpacing(1)), - `VSpacing(1), - `VStretch(), - `HBox( - `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), - `Right(`HBox ( - `PushButton(`id(`ok), - `opt(`default), - Label::OKButton()), - `PushButton(`id(`cancel), - Label::CancelButton())) - ) - ) - ) - ); + UI::OpenDialog(`opt(`decorated), + `VBox( + `HSpacing(50), + // heading text + `Left(`Heading(_("Fstab options:"))), + `VStretch(), + `VSpacing(1), + `HBox(`HStretch(), + `HSpacing(1), + contents, + `HStretch(), + `HSpacing(1)), + `VSpacing(1), + `VStretch(), + `HBox( + `Left(`PushButton(`id(`help),`opt(`helpButton), Label::HelpButton())), + `Right(`HBox(`PushButton(`id(`ok), `opt(`default), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton())) + ) + ) + ) + ); + + UI::ChangeWidget(`help, `HelpText, helptext); if( UI::WidgetExists( `id(`mt_group) )) { @@ -706,10 +702,6 @@ { ret = UI::UserInput(); y2milestone( "FstabOptions ret %1", ret ); - if( ret == `help) - { - Popup::LongText(_("Fstab Options Help"), `RichText(helptext), 50,20); - } if( ret == "opt_noauto" ) { if( UI::WidgetExists( `id("opt_user") )) -- 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] r49573 - in /trunk/ldap-server/src: LdapServer.pm tree_structure.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 14:20:12 2008 New Revision: 49573 URL: http://svn.opensuse.org/viewcvs/yast?rev=49573&view=rev Log: - Moved validation of TLS Parameters from the GUI into main module - Made SSL listener checkbox working in TLS dialog 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 Fri Aug 1 14:20:12 2008 @@ -755,13 +755,32 @@ { my $self = shift; my $tls = shift; - my $ret = SCR->Execute(".target.bash", - "/usr/bin/setfacl -m u:ldap:r ".$tls->{'certKeyFile'}); - if($ret != 0) { - return $self->SetError(_("Can not set a filesystem acl on the private key"), - "setfacl -m u:ldap:r "./etc/ssl/servercerts/serverkey.pem." failed.\n". - "Do you have filesystem acl support disabled?" ); - return 0; + if ( YaST::YCP::Boolean($tls->{'tls_active'}) ) + { + if ( SCR->Read(".target.size", $tls->{"caCertFile"}) <= 0) + { + $self->SetError( _("CA Certificate File does not exist"), ""); + return 0; + } + if ( SCR->Read(".target.size", $tls->{"certFile"}) <= 0) + { + $self->SetError( _("Certificate File does not exist"), "" ); + return 0; + } + if ( SCR->Read(".target.size", $tls->{"certKeyFile"}) <= 0) + { + $self->SetError( _("Certificate Key File does not exist"), ""); + return 0; + } + + if ( SCR->Execute(".target.bash", + "/usr/bin/setfacl -m u:ldap:r ".$tls->{'certKeyFile'}) ) + { + $self->SetError(_("Can not set a filesystem acl on the private key"), + "setfacl -m u:ldap:r ".$tls->{'certKeyFile'}." failed.\n". + "Do you have filesystem acl support disabled?" ); + return 0; + } } my $rc = SCR->Write('.ldapserver.global.tlsSettings', $tls ); return 1; @@ -774,7 +793,7 @@ my $ret = SCR->Execute(".target.bash", "/usr/bin/setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem"); if($ret != 0) { - return $self->SetError(_("Can not set a filesystem acl on the private key"), + $self->SetError(_("Can not set a filesystem acl on the private key"), "setfacl -m u:ldap:r /etc/ssl/servercerts/serverkey.pem failed.\n". "Do you have filesystem acl support disabled?" ); return 0; @@ -1273,7 +1292,7 @@ sub GetProtocolListenerEnabled { my ( $self, $protocol ) = @_; - y2milestone("GetProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener"); + y2milestone("GetProtocolListenerEnabled $protocol (ldapi $use_ldapi_listener, ldaps $use_ldaps_listener, ldap $use_ldap_listener)"); if ( $protocol eq "ldap" ) { return $use_ldap_listener; 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 Fri Aug 1 14:20:12 2008 @@ -362,6 +362,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( `te_ca_file, `Value, tls["caCertFile"]:"" ); UI::ChangeWidget( `te_cert_file, `Value, tls["certFile"]:"" ); UI::ChangeWidget( `te_key_file, `Value, tls["certKeyFile"]:"" ); @@ -386,29 +387,18 @@ "crlCheck" : 0, "verifyClient" : 0 ]; - if ( SCR::Read(.target.size, tlsSettings["caCertFile"]:"") <= 0) + if ( ! LdapServer::SetTlsConfig( tlsSettings ) ) { - callback_error = _("CA Certificate File does not exist"); - return false; - } - if ( SCR::Read(.target.size, tlsSettings["certFile"]:"") <= 0) - { - callback_error = _("Certificate File does not exist"); - return false; - } - if ( SCR::Read(.target.size, tlsSettings["certKeyFile"]:"") <= 0) - { - callback_error = _("Certificate Key File does not exist"); + map<string, string> err = LdapServer::GetError(); + callback_error = err["msg"]:"" + err["details"]:""; return false; } - - LdapServer::SetTlsConfig( tlsSettings ); + LdapServer::SetProtocolListenerEnabled( "ldaps", (boolean) UI::QueryWidget( `id( `cb_ssl_listener_enabled ), `Value ) ); } else { -// LdapServer::WriteConfigureCommonServerCertificate( false ); -// LdapServer::WriteImportCertificates( $[] ); map<string,any> tlsSettings = $[ + "tls_active" : false, "certKeyFile" : "", "certFile" : "", "caCertFile" : "", @@ -419,6 +409,7 @@ ]; LdapServer::SetTlsConfig( tlsSettings ); + LdapServer::SetProtocolListenerEnabled( "ldaps", false ); } return true; } @@ -435,6 +426,7 @@ if ( tls_enabled_cb ) { UI::ChangeWidget( `cb_ssl_listener_enabled, `Enabled, true ); + UI::ChangeWidget( `cb_ssl_listener_enabled, `Value, true ); if ( common_cert_available ) { UI::ChangeWidget( `cb_use_common_cert, `Enabled, true ); -- 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] r49572 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 14:20:09 2008 New Revision: 49572 URL: http://svn.opensuse.org/viewcvs/yast?rev=49572&view=rev Log: Set filesystem ACLs for Certificate Key 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 Fri Aug 1 14:20:09 2008 @@ -755,6 +755,14 @@ { my $self = shift; my $tls = shift; + my $ret = SCR->Execute(".target.bash", + "/usr/bin/setfacl -m u:ldap:r ".$tls->{'certKeyFile'}); + if($ret != 0) { + return $self->SetError(_("Can not set a filesystem acl on the private key"), + "setfacl -m u:ldap:r "./etc/ssl/servercerts/serverkey.pem." failed.\n". + "Do you have filesystem acl support disabled?" ); + return 0; + } my $rc = SCR->Write('.ldapserver.global.tlsSettings', $tls ); return 1; } -- 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] r49571 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: rhafer Date: Fri Aug 1 14:20:05 2008 New Revision: 49571 URL: http://svn.opensuse.org/viewcvs/yast?rev=49571&view=rev Log: Check ssl cert file for existance and error out if they don't exist Modified: trunk/ldap-server/src/tree_structure.ycp 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 Fri Aug 1 14:20:05 2008 @@ -386,6 +386,22 @@ "crlCheck" : 0, "verifyClient" : 0 ]; + if ( SCR::Read(.target.size, tlsSettings["caCertFile"]:"") <= 0) + { + callback_error = _("CA Certificate File does not exist"); + return false; + } + if ( SCR::Read(.target.size, tlsSettings["certFile"]:"") <= 0) + { + callback_error = _("Certificate File does not exist"); + return false; + } + if ( SCR::Read(.target.size, tlsSettings["certKeyFile"]:"") <= 0) + { + callback_error = _("Certificate Key File does not exist"); + return false; + } + LdapServer::SetTlsConfig( tlsSettings ); } else -- 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] r49570 - in /trunk/storage/storage/src: include/evms_lib.ycp inst_custom_part.ycp inst_evms.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 12:32:53 2008 New Revision: 49570 URL: http://svn.opensuse.org/viewcvs/yast?rev=49570&view=rev Log: - removed some obsolete evms files Removed: trunk/storage/storage/src/include/evms_lib.ycp trunk/storage/storage/src/inst_evms.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 12:32:53 2008 @@ -58,7 +58,6 @@ include "partitioning/custom_part_lib.ycp"; include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; - include "partitioning/evms_lib.ycp"; include "partitioning/ep-main.ycp"; @@ -2593,12 +2592,6 @@ } else if( part["type"]:`unknown == `evms ) { - map ad = edit_evms_volume( id, tg ); - // has the user cancelled the dialog? - if( ad["ok"]:false && size( ad["targets"]:$[] )>0 ) - { - Storage::SetTargetMap( ad["targets"]:$[] ); - } } else if( part["type"]:`unknown == `loop ) { -- 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] r49569 - in /trunk/storage/storage/src: include/ep-lib.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 12:15:18 2008 New Revision: 49569 URL: http://svn.opensuse.org/viewcvs/yast?rev=49569&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/ep-lib.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Fri Aug 1 12:15:18 2008 @@ -78,7 +78,7 @@ { if( Popup::YesNo( sformat(_("Really delete BIOS RAID %1?"), id ))) { - if( deleteAllDevPartitions( disk, Stage::initial(), bsd_label )) + if( deleteAllDevPartitions( disk, Stage::initial(), false )) Storage::DeleteDmraid( id ); return true; } @@ -86,7 +86,7 @@ // YesNo popup text %1 is replaced by a disk name e.g. /dev/hda else if( Popup::YesNo( sformat(_("Really delete all partitions on %1?"), id ))) { - deleteAllDevPartitions( disk, Stage::initial(), bsd_label ); + deleteAllDevPartitions( disk, Stage::initial(), false ); return true; } } @@ -121,7 +121,7 @@ return false; } if( part["type"]:`primary != `extended && - !check_device_delete( part, bsd_label, Stage::initial(), + !check_device_delete( part, false, Stage::initial(), disk )) { return false; Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Fri Aug 1 12:15:18 2008 @@ -59,6 +59,7 @@ include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_check_generated.ycp"; include "partitioning/evms_lib.ycp"; + include "partitioning/ep-main.ycp"; boolean show_disk = true; @@ -2120,7 +2121,6 @@ // MAIN: ///////////////////////////////////////////////////////////////// - include "partitioning/ep-main.ycp"; return test_new_ep(); -- 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] r49568 - /trunk/storage/package/yast2-storage.changes
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 12:06:25 2008 New Revision: 49568 URL: http://svn.opensuse.org/viewcvs/yast?rev=49568&view=rev Log: - added second fate number Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Fri Aug 1 12:06:25 2008 @@ -2,7 +2,8 @@ Fri Aug 01 10:42:52 CEST 2008 - aschnell(a)suse.de - redesigned expert partitioner (fate #302054) -- added dialog to choose partition table type (fate #303924) +- added dialog to choose partition table type (fate #303924 and + fate #303026) - version 2.17.8 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0