February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67375 - in /trunk/installation: VERSION package/yast2-installation.changes startup/YaST2.call startup/YaST2.ssh
by tgoettlicher＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: tgoettlicher Date: Tue Feb 7 17:25:24 2012 New Revision: 67375 URL: http://svn.opensuse.org/viewcvs/yast?rev=67375&view=rev Log: - Fixed bnc #742777: ssh installation needs to much bandwidth - 2.22.2 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/startup/YaST2.call trunk/installation/startup/YaST2.ssh Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=67375&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Tue Feb 7 17:25:24 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Feb 7 17:25:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 7 17:22:46 CET 2012 - tgoettlicher(a)suse.de + +- Fixed bnc #742777: ssh installation needs to much bandwidth +- 2.22.2 + +------------------------------------------------------------------- Fri Jan 13 11:02:40 CET 2012 - jsuchome(a)suse.cz - confirmed license Modified: trunk/installation/startup/YaST2.call URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.call?… ============================================================================== --- trunk/installation/startup/YaST2.call (original) +++ trunk/installation/startup/YaST2.call Tue Feb 7 17:25:24 2012 @@ -147,6 +147,7 @@ # --- # : + export Y2STYLE="installation_slim" } #----[ prepare_for_vnc ]----# @@ -155,6 +156,7 @@ # prepare VNC installation # --- # + export Y2STYLE="installation_slim" #============================================= # Setup splash screen #--------------------------------------------- Modified: trunk/installation/startup/YaST2.ssh URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/startup/YaST2.ssh?r… ============================================================================== --- trunk/installation/startup/YaST2.ssh (original) +++ trunk/installation/startup/YaST2.ssh Tue Feb 7 17:25:24 2012 @@ -59,6 +59,8 @@ #---------------------------------------- if [ -f /var/lib/YaST2/runme_at_boot ];then + export Y2STYLE="installation_slim" + # running the second stage installation /usr/lib/YaST2/startup/YaST2.call installation continue -- 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] r67374 - /tags/branch-Code-11-SP2-2_17_14/http-server/
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 16:08:02 2012 New Revision: 67374 URL: http://svn.opensuse.org/viewcvs/yast?rev=67374&view=rev Log: Created tag branch-Code-11-SP2-2_17_14 for http-server Added: tags/branch-Code-11-SP2-2_17_14/http-server/ (props changed) - copied from r67373, branches/SuSE-Code-11-SP2-Branch/http-server/ -- 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] r67373 - in /branches/SuSE-Code-11-SP1-Branch/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm src/http-server.desktop
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 11:55:37 2012 New Revision: 67373 URL: http://svn.opensuse.org/viewcvs/yast?rev=67373&view=rev Log: Getting SP1 into the same state as SP2 - not wanted to maintain more than one version in SLE 11 - Especially fixed bug with NameVirtualHost (bnc#486475) Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Modified: branches/SuSE-Code-11-SP1-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/VERSION Tue Feb 7 11:55:37 2012 @@ -1 +1 @@ -2.17.11 +2.17.14 Modified: branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/package/yast2-http-server.changes Tue Feb 7 11:55:37 2012 @@ -1,7 +1,20 @@ ------------------------------------------------------------------- +Tue Feb 7 11:45:02 UTC 2012 - locilka(a)suse.cz + +- Backported a real fix for NameVirtualHost from trunk (bnc#486475) +- 2.17.14 + +------------------------------------------------------------------- +Thu Dec 22 09:39:32 UTC 2011 - jsrain(a)suse.cz + +- removed superfluous spaces from .desktop-file (bnc#712052) +- 2.17.13 + +------------------------------------------------------------------- Fri Feb 25 13:53:54 CET 2011 - jsrain(a)suse.cz - fixed server flags handling (bnc#656589) +- 2.17.12 ------------------------------------------------------------------- Wed Mar 25 14:06:28 CET 2009 - mzugec(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/YaPI/HTTPD.pm Tue Feb 7 11:55:37 2012 @@ -538,6 +538,7 @@ # $vhost_files->{$ip} = @newdata; # } + $self->validateNVH(); } @@ -588,29 +589,28 @@ # push(@newdata, $row); # } # } -my $params = $self->getVhType($hostid); - - $self->deleteVH($hostid); - $self->createVH($hostid, $data, $params); - $self->validateNVH(); + my $params = $self->getVhType($hostid); + $self->deleteVH($hostid); + $self->createVH($hostid, $data, $params); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } + my @tmp_data=(); foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); } $vhost_files->{main}{DATA} = \@tmp_data; - - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } Modified: branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop (original) +++ branches/SuSE-Code-11-SP1-Branch/http-server/src/http-server.desktop Tue Feb 7 11:55:37 2012 @@ -16,7 +16,7 @@ X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=http-server X-SuSE-YaST-AutoInstClonable=true -X-SuSE-YaST-AutoInstSchema = http-server.rnc +X-SuSE-YaST-AutoInstSchema=http-server.rnc Icon=yast-http-server Exec=/sbin/yast2 http-server -- 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] r67372 - in /branches/SuSE-Code-11-SP2-Branch/http-server: VERSION package/yast2-http-server.changes src/YaPI/HTTPD.pm
by locilka＠svn2.opensuse.org 07 Feb '12

07 Feb '12

Author: locilka Date: Tue Feb 7 11:53:41 2012 New Revision: 67372 URL: http://svn.opensuse.org/viewcvs/yast?rev=67372&view=rev Log: - Backported a real fix for NameVirtualHost from trunk (bnc#486475) - 2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/http-server/VERSION branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm Modified: branches/SuSE-Code-11-SP2-Branch/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/VERSION Tue Feb 7 11:53:41 2012 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/package/yast2-http-server.changes Tue Feb 7 11:53:41 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 7 11:45:02 UTC 2012 - locilka(a)suse.cz + +- Backported a real fix for NameVirtualHost from trunk (bnc#486475) +- 2.17.14 + +------------------------------------------------------------------- Thu Dec 22 09:39:32 UTC 2011 - jsrain(a)suse.cz - removed superfluous spaces from .desktop-file (bnc#712052) Modified: branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/http-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/http-server/src/YaPI/HTTPD.pm Tue Feb 7 11:53:41 2012 @@ -538,6 +538,7 @@ # $vhost_files->{$ip} = @newdata; # } + $self->validateNVH(); } @@ -588,29 +589,28 @@ # push(@newdata, $row); # } # } -my $params = $self->getVhType($hostid); - - $self->deleteVH($hostid); - $self->createVH($hostid, $data, $params); - $self->validateNVH(); + my $params = $self->getVhType($hostid); + $self->deleteVH($hostid); + $self->createVH($hostid, $data, $params); } sub validateNVH (){ - my @nb = (); + my %nb = (); foreach my $key ( keys( %{$vhost_files} ) ){ if(($key ne 'ip-based') && ($key ne 'main')){ - push(@nb, $key); + my $host_ip=$vhost_files->{$key}->[0]->{'HostIP'}; + $nb{$host_ip}=1; } } + my @tmp_data=(); foreach my $row (@{$vhost_files->{main}{DATA}}){ - push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); + push(@tmp_data, $row) if ($row->{KEY} ne 'NameVirtualHost'); } $vhost_files->{main}{DATA} = \@tmp_data; - - foreach my $ip (@nb){ + foreach my $ip (keys %nb){ push(@{$vhost_files->{main}{DATA}}, {KEY=>'NameVirtualHost', VALUE=>$ip} ); } -- 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] r67371 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: fehr Date: Mon Feb 6 14:35:49 2012 New Revision: 67371 URL: http://svn.opensuse.org/viewcvs/yast?rev=67371&view=rev Log: change detection of qla iscsi devices (bnc#745201) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp 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 Mon Feb 6 14:35:49 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de + +- change detection of qla iscsi devices (bnc#745201) + +------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de - call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Mon Feb 6 14:35:49 2012 @@ -651,7 +651,7 @@ [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ], [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ], - [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [ "qla4xxx" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ "qla4xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ] ]; @@ -698,11 +698,12 @@ y2milestone( "GetOffloadItems card:%1", c ); list<list> tmp = maplist( map m, c["drivers"]:[], ``(flatten((list<list>)m["modules"]:[]))); - return( $["modules":maplist( list ml, tmp, ``(ml[0]:"")), + map r = $["modules":maplist( list ml, tmp, ``(ml[0]:"")), "iface":c["dev_name"]:"", - "macaddr":c["resource","hwaddr",0,"addr"]:""]); + "macaddr":c["resource","hwaddr",0,"addr"]:""]; + y2milestone( "GetOffloadItems cinf:%1", r ); + return( r ); }); - y2milestone( "GetOffloadItems hw_mods:%1", hw_mods ); integer idx = 0; foreach( list<any> l, offload, ``{ @@ -714,8 +715,12 @@ foreach( map hw, hw_mods, ``{ if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) + { + y2milestone( "GetOffloadItems l:%1", l ); + y2milestone( "GetOffloadItems valid:%1", hw ); offload_valid[idx] = add( offload_valid[idx]:[], [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] ); + } }); } idx = idx+1; @@ -729,7 +734,8 @@ cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); - y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", + SCR::Execute (.target.bash_output, offboard_script + " " + l[0]:"" )); offload_res[l[0]:""] = $[]; offload_res[l[0]:"","exit"] = out["exit"]:1; list<string> sl = []; -- 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] r67370 - /tags/branch-Code-11-SP2-2_17_34/iscsi-client/
by fehr＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: fehr Date: Mon Feb 6 14:07:20 2012 New Revision: 67370 URL: http://svn.opensuse.org/viewcvs/yast?rev=67370&view=rev Log: Created tag branch-Code-11-SP2-2_17_34 for iscsi-client Added: tags/branch-Code-11-SP2-2_17_34/iscsi-client/ (props changed) - copied from r67369, branches/SuSE-Code-11-SP2-Branch/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] r67369 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: fehr Date: Mon Feb 6 14:07:11 2012 New Revision: 67369 URL: http://svn.opensuse.org/viewcvs/yast?rev=67369&view=rev Log: - 2.17.34 - change detection of qla iscsi devices (bnc#745201) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Mon Feb 6 14:07:11 2012 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Mon Feb 6 14:07:11 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de + +- 2.17.34 +- change detection of qla iscsi devices (bnc#745201) + +------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de - 2.17.33 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Mon Feb 6 14:07:11 2012 @@ -651,7 +651,7 @@ [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] ], [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ], [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ], - [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [ "qla4xxx" ] ], + [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ "qla4xxx" ] ], [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ] ]; @@ -698,11 +698,12 @@ y2milestone( "GetOffloadItems card:%1", c ); list<list> tmp = maplist( map m, c["drivers"]:[], ``(flatten((list<list>)m["modules"]:[]))); - return( $["modules": [ c["driver_module"]:"" ], + map r = $["modules": [ c["driver_module"]:"" ], "iface":c["dev_name"]:"", - "macaddr":c["resource","hwaddr",0,"addr"]:""]); + "macaddr":c["resource","hwaddr",0,"addr"]:""]; + y2milestone( "GetOffloadItems cinf:%1", r ); + return( r ); }); - y2milestone( "GetOffloadItems hw_mods:%1", hw_mods ); integer idx = 0; foreach( list<any> l, offload, ``{ @@ -715,8 +716,12 @@ ``{ //if( size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 ) if( size(mod)+size(hw["modules"]:[])>size(union(mod,hw["modules"]:[]))) + { + y2milestone( "GetOffloadItems l:%1", l ); + y2milestone( "GetOffloadItems valid:%1", hw ); offload_valid[idx] = add( offload_valid[idx]:[], [ hw["iface"]:"", hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] ); + } }); } idx = idx+1; @@ -730,7 +735,8 @@ cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:.."; y2milestone( "GetOffloadItems cmd:%1", cmd ); map out = (map) SCR::Execute (.target.bash_output, cmd ); - y2milestone( "GetOffloadItems iscsi_offload out:%1", out ); + y2milestone( "GetOffloadItems iscsi_offload out:%1", + SCR::Execute (.target.bash_output, offboard_script + " " + l[0]:"" )); offload_res[l[0]:""] = $[]; offload_res[l[0]:"","exit"] = out["exit"]:1; list<string> sl = []; -- 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] r67368 - /tags/branch-Code-11-SP2-2_17_14/kerberos-client/
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:16:14 2012 New Revision: 67368 URL: http://svn.opensuse.org/viewcvs/yast?rev=67368&view=rev Log: Created tag branch-Code-11-SP2-2_17_14 for kerberos-client Added: tags/branch-Code-11-SP2-2_17_14/kerberos-client/ (props changed) - copied from r67367, branches/SuSE-Code-11-SP2-Branch/kerberos-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] r67367 - in /branches/SuSE-Code-11-SP2-Branch/kerberos-client: VERSION package/yast2-kerberos-client.changes src/Kerberos.ycp
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:15:38 2012 New Revision: 67367 URL: http://svn.opensuse.org/viewcvs/yast?rev=67367&view=rev Log: - removed previous workaround (bnc#743355 fixed properly) - 2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/kerbe… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/kerberos-client/VERSION Mon Feb 6 12:15:38 2012 @@ -1 +1 @@ -2.17.13 +2.17.14 Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/kerbe… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/kerberos-client/package/yast2-kerberos-client.changes Mon Feb 6 12:15:38 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 6 08:37:24 CET 2012 - jsuchome(a)suse.cz + +- removed previous workaround (bnc#743355 fixed properly) +- 2.17.14 + +------------------------------------------------------------------- Thu Jan 26 15:49:18 CET 2012 - jsuchome(a)suse.cz - change mode of sssd.conf file after writing (workaround for Modified: branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/kerbe… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/kerberos-client/src/Kerberos.ycp Mon Feb 6 12:15:38 2012 @@ -525,13 +525,8 @@ SCR::Write (add (domain, "krb5_kdcip"), krb5_kdcip); if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing sssd.conf file"); + y2error ("error writing ldap.conf file"); } - else - { - // workadound for ini-agent bug (bnc#743355) - SCR::Execute (.target.bash, "/bin/chmod 600 /etc/sssd/sssd.conf"); - } } else if (use_pam_krb) { -- 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] r67366 - /tags/branch-Code-11-SP2-2_17_34/ldap-client/
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:15:05 2012 New Revision: 67366 URL: http://svn.opensuse.org/viewcvs/yast?rev=67366&view=rev Log: Created tag branch-Code-11-SP2-2_17_34 for ldap-client Added: tags/branch-Code-11-SP2-2_17_34/ldap-client/ (props changed) - copied from r67365, branches/SuSE-Code-11-SP2-Branch/ldap-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] r67365 - /tags/branch-Code-11-SP2-2_17_34/
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:15:03 2012 New Revision: 67365 URL: http://svn.opensuse.org/viewcvs/yast?rev=67365&view=rev Log: Created tag branch-Code-11-SP2-2_17_34 Added: tags/branch-Code-11-SP2-2_17_34/ -- 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] r67364 - in /branches/SuSE-Code-11-SP2-Branch/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp
by jsuchome＠svn2.opensuse.org 06 Feb '12

06 Feb '12

Author: jsuchome Date: Mon Feb 6 12:14:43 2012 New Revision: 67364 URL: http://svn.opensuse.org/viewcvs/yast?rev=67364&view=rev Log: - removed previous workaround (bnc#743355 fixed properly) - 2.17.34 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/VERSION Mon Feb 6 12:14:43 2012 @@ -1 +1 @@ -2.17.33 +2.17.34 Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/package/yast2-ldap-client.changes Mon Feb 6 12:14:43 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 6 08:36:00 CET 2012 - jsuchome(a)suse.cz + +- removed previous workaround (bnc#743355 fixed properly) +- 2.17.34 + +------------------------------------------------------------------- Thu Jan 26 15:47:22 CET 2012 - jsuchome(a)suse.cz - change mode of sssd.conf file after writing (workaround for Modified: branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-client/src/Ldap.ycp Mon Feb 6 12:14:43 2012 @@ -2240,10 +2240,9 @@ */ global boolean WriteSSSDConfig () { - string file = "/etc/sssd/sssd.conf"; - if (!FileUtils::Exists (file)) + if (!FileUtils::Exists ("/etc/sssd/sssd.conf")) { - y2warning ("file %1 does not exists: not writing", file); + y2warning ("file /etc/sssd/sssd.conf does not exists: not writing"); return false; } @@ -2306,13 +2305,8 @@ if (!SCR::Write(.etc.sssd_conf, nil)) { - y2error ("error writing %1 file", file); + y2error ("error writing ldap.conf file"); } - else - { - // workadound for ini-agent bug (bnc#743355) - SCR::Execute (.target.bash, sformat ("/bin/chmod 600 %1", file)); - } 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

[yast-commit] r67363 - /trunk/ycp-ui-bindings/examples/LogView2.ycp
by tgoettlicher＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: tgoettlicher Date: Fri Feb 3 17:16:32 2012 New Revision: 67363 URL: http://svn.opensuse.org/viewcvs/yast?rev=67363&view=rev Log: added an example for logview Added: trunk/ycp-ui-bindings/examples/LogView2.ycp Added: trunk/ycp-ui-bindings/examples/LogView2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/LogView… ============================================================================== --- trunk/ycp-ui-bindings/examples/LogView2.ycp (added) +++ trunk/ycp-ui-bindings/examples/LogView2.ycp Fri Feb 3 17:16:32 2012 @@ -0,0 +1,25 @@ +{ + + any button = nil; + + + UI::OpenDialog( + `VBox( + `LogView(`id(`log), + "Log View ", + 15, // visible lines + 0), // lines to store + `PushButton(`id(`ok), "&OK") + ) + ); + + repeat + { + string line = tostring(random(100)); + UI::ChangeWidget(`id(`log), `LastLine, line ); + button = UI::TimeoutUserInput(100); + + } until ( button == `ok ); + + UI::CloseDialog(); +} -- 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] r67362 - in /trunk/core/agent-ini/testsuite/multi: private.err private.in.0 private.in.1 private.in.2 private.in.3 private.out private.scr private.ycp
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 16:57:39 2012 New Revision: 67362 URL: http://svn.opensuse.org/viewcvs/yast?rev=67362&view=rev Log: Better test cases for section_private (bnc#743355). Added: trunk/core/agent-ini/testsuite/multi/private.in.0 trunk/core/agent-ini/testsuite/multi/private.in.1 trunk/core/agent-ini/testsuite/multi/private.in.3 Modified: trunk/core/agent-ini/testsuite/multi/private.err trunk/core/agent-ini/testsuite/multi/private.in.2 trunk/core/agent-ini/testsuite/multi/private.out trunk/core/agent-ini/testsuite/multi/private.scr trunk/core/agent-ini/testsuite/multi/private.ycp Modified: trunk/core/agent-ini/testsuite/multi/private.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.err (original) +++ trunk/core/agent-ini/testsuite/multi/private.err Fri Feb 3 16:57:39 2012 @@ -1,11 +1,45 @@ +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.0.test to 0 +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 1 to .v."1"."Totalise"."Password" -[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Totalise to .v."1"."Totalise"."Password" -[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1"."Totalise"."Password" = "Secret password" -[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2"."arcor"."Password" = "Public password" +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.3.test to 3 +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."0".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."0".Section.Key = "existing public implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."1".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1".Section.Key = "existing public explicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."2".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2".Section.Key = "existing private implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."3".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."3".Section.Key = "existing private explicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 4 to .v."4".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."4".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."4".Section.Key = "new public implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 5 to .v."5".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."5".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."5".Section.Key = "new public explicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 6 to .v."6".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."6".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."6".Section.Key = "new private implicit" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 7 to .v."7".Section.Key +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Section to .v."7".Section.Key +[agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."7".Section.Key = "new private explicit" +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.0.test to 0 +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.3.test to 3 +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 0 to multi/private.in.0.test [agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test -[YCP] multi/private.ycp:XXX secret file mode: $["exit":0, "stderr":"", "stdout":"600\n"] -[YCP] multi/private.ycp:XXX public file mode: $["exit":0, "stderr":"", "stdout":"644\n"] +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 3 to multi/private.in.3.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 4 to multi/private.in.4.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 5 to multi/private.in.5.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 6 to multi/private.in.6.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 7 to multi/private.in.7.test +[YCP] multi/private.ycp:XXX existing public implicit file mode: 644 +[YCP] multi/private.ycp:XXX existing public explicit file mode: 644 +[YCP] multi/private.ycp:XXX existing private implicit file mode: 600 +[YCP] multi/private.ycp:XXX existing private explicit file mode: 600 +[YCP] multi/private.ycp:XXX new public implicit file mode: 644 +[YCP] multi/private.ycp:XXX new public explicit file mode: 644 +[YCP] multi/private.ycp:XXX new private implicit file mode: 644 +[YCP] multi/private.ycp:XXX new private explicit file mode: 600 [agent-ini] IniParser.cc(write):XXX File multi/private.in.*.test did not change. Not saving. Added: trunk/core/agent-ini/testsuite/multi/private.in.0 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== (empty) Added: trunk/core/agent-ini/testsuite/multi/private.in.1 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== (empty) Modified: trunk/core/agent-ini/testsuite/multi/private.in.2 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.in.2 (original) +++ trunk/core/agent-ini/testsuite/multi/private.in.2 Fri Feb 3 16:57:39 2012 @@ -1,11 +0,0 @@ -[Dialer arcor] -Compuserve = 0 -Provider = Arcor -[End] - -[Dialer mobilcom] -Compuserve = 0 -Provider = Mobilcom -Phone = 0101901929 -[End] - Added: trunk/core/agent-ini/testsuite/multi/private.in.3 URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== (empty) Modified: trunk/core/agent-ini/testsuite/multi/private.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.out (original) +++ trunk/core/agent-ini/testsuite/multi/private.out Fri Feb 3 16:57:39 2012 @@ -1,17 +1,25 @@ (nil) +multi/private.in.0.test ------------------------------- +[Section] +Key = existing public implicit multi/private.in.1.test ------------------------------- -[Dialer Totalise] - Password = Secret password -[End] +[Section] +Key = existing public explicit multi/private.in.2.test ------------------------------- -[Dialer arcor] - Compuserve = 0 - Provider = Arcor - Password = Public password -[End] - -[Dialer mobilcom] - Compuserve = 0 - Provider = Mobilcom - Phone = 0101901929 -[End] +[Section] +Key = existing private implicit +multi/private.in.3.test ------------------------------- +[Section] +Key = existing private explicit +multi/private.in.4.test ------------------------------- +[Section] +Key = new public implicit +multi/private.in.5.test ------------------------------- +[Section] +Key = new public explicit +multi/private.in.6.test ------------------------------- +[Section] +Key = new private implicit +multi/private.in.7.test ------------------------------- +[Section] +Key = new private explicit Modified: trunk/core/agent-ini/testsuite/multi/private.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.scr (original) +++ trunk/core/agent-ini/testsuite/multi/private.scr Fri Feb 3 16:57:39 2012 @@ -6,12 +6,11 @@ "rewrite" : [ [ "multi/private\.in\.(.)\.test$", "multi/private.in.%s.test"], ], - "subindent" : " ", + "subindent" : "", "comments": [ "^[ \t]*#.*", "^[ \t]*$" ], "sections" : [ $[ - "begin" : [ "[ \t]*\\[Dialer[ \t]+(.*[^ \t])[ \t]*\\][ \t]*", "[Dialer %s]" ], - "end" : [ "^[ \t]*\\[End\\][ \t]*$", "[End]", ], + "begin" : [ "[ \t]*\\[(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], ], ], "params" : [ Modified: trunk/core/agent-ini/testsuite/multi/private.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.ycp (original) +++ trunk/core/agent-ini/testsuite/multi/private.ycp Fri Feb 3 16:57:39 2012 @@ -1,26 +1,49 @@ -// -// Multiple files test -// -// providers.rpm -// - +// test private files, bnc#743355 { SCR::RegisterAgent (.target, `ag_system ()); - any out = nil; - - SCR::Write (.v."1"."Totalise"."Password", "Secret password"); - SCR::Write (.section_private."1", true); - - SCR::Write (.v."2"."arcor"."Password", "Public password"); + // 8 combinations to test + // bitmask: + // 4: new file, 0: existing file + // 2: secret 0: public + // 1: explicit with section_private 0: implicit with permisions of existing file + + // #2, existing private implicit, was the one reported about sssd.conf + // #6, new private implicit, is a contradiciton in requirements, XFAIL + + string description(integer i) { + string new_s = ((i & 4) != 0)? + "new ": + "existing "; + string private_s = ((i & 2) != 0)? + "private ": + "public "; + string explicit_s = ((i & 1) != 0)? + "explicit": + "implicit"; + return new_s + private_s + explicit_s; + } + + // fix permissions of fixtures from svn/git + foreach(integer i, [2, 3], { + SCR::Execute (.target.bash, sformat("chmod 600 multi/private.in.%1.test", i)); + }); + + foreach(integer i, [0, 1, 2, 3, 4, 5, 6, 7], { + string i_str = tostring(i); + SCR::Write (add(add(.v, i_str), .Section.Key), description(i)); + + if ((i & 1) != 0) { + SCR::Write (add(.section_private, i_str), (i & 2) != 0); + } + }); SCR::Write (., nil); //flush - out = SCR::Execute (.target.bash_output, "stat -c %a multi/private.in.1.test"); - y2milestone("secret file mode: %1", out); - - out = SCR::Execute (.target.bash_output, "stat -c %a multi/private.in.2.test"); - y2milestone("public file mode: %1", out); + foreach(integer i, [0, 1, 2, 3, 4, 5, 6, 7], { + map out = (map) SCR::Execute (.target.bash_output, sformat("stat -c %%a multi/private.in.%1.test", i)); + y2milestone("%1 file mode: %2", description(i), out["stdout"]:""); + }); return nil; } -- 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] r67361 - in /trunk/core: ./ agent-ini/src/ agent-ini/testsuite/multi/ package/
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 16:55:59 2012 New Revision: 67361 URL: http://svn.opensuse.org/viewcvs/yast?rev=67361&view=rev Log: ini-agent: only change permissions of new files (bnc#743355) svn merge -c67360 http://svn.opensuse.org/svn/yast/branches/SuSE-Code-11-SP2-Branch/core Removed: trunk/core/agent-ini/testsuite/multi/private.in.1 Modified: trunk/core/ (props changed) trunk/core/VERSION trunk/core/agent-ini/src/IniParser.cc trunk/core/agent-ini/testsuite/multi/private.err trunk/core/agent-ini/testsuite/multi/private.out trunk/core/package/yast2-core.changes Modified: trunk/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/VERSION?rev=67361&r1=67360&… ============================================================================== --- trunk/core/VERSION (original) +++ trunk/core/VERSION Fri Feb 3 16:55:59 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/core/agent-ini/src/IniParser.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/src/IniParser.cc?… ============================================================================== --- trunk/core/agent-ini/src/IniParser.cc (original) +++ trunk/core/agent-ini/src/IniParser.cc Fri Feb 3 16:55:59 2012 @@ -1000,8 +1000,6 @@ mode_t file_umask = section.isPrivate()? 0077: 0022; mode_t orig_umask = umask(file_umask); - // rewriting an existing file wouldnt change its mode - unlink(filename.c_str()); ofstream of(filename.c_str()); if (!of.good()) { Modified: trunk/core/agent-ini/testsuite/multi/private.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.err (original) +++ trunk/core/agent-ini/testsuite/multi/private.err Fri Feb 3 16:55:59 2012 @@ -1,11 +1,11 @@ -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 1 to .v."1"."Totalise"."Password" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Totalise to .v."1"."Totalise"."Password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1"."Totalise"."Password" = "Secret password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2"."arcor"."Password" = "Public password" -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [YCP] multi/private.ycp:XXX secret file mode: $["exit":0, "stderr":"", "stdout":"600\n"] [YCP] multi/private.ycp:XXX public file mode: $["exit":0, "stderr":"", "stdout":"644\n"] [agent-ini] IniParser.cc(write):XXX File multi/private.in.*.test did not change. Not saving. Modified: trunk/core/agent-ini/testsuite/multi/private.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/agent-ini/testsuite/multi/p… ============================================================================== --- trunk/core/agent-ini/testsuite/multi/private.out (original) +++ trunk/core/agent-ini/testsuite/multi/private.out Fri Feb 3 16:55:59 2012 @@ -1,16 +1,8 @@ (nil) multi/private.in.1.test ------------------------------- [Dialer Totalise] - Compuserve = 0 - Provider = Totalise - Phone = 08453001470 Password = Secret password [End] - -[Dialer force9] - Provider = Force9 - Phone = 08451424000 -[End] multi/private.in.2.test ------------------------------- [Dialer arcor] Compuserve = 0 Modified: trunk/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/package/yast2-core.changes?… ============================================================================== --- trunk/core/package/yast2-core.changes (original) +++ trunk/core/package/yast2-core.changes Fri Feb 3 16:55:59 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 3 14:36:31 CET 2012 - mvidner(a)suse.cz + +- ini-agent: only change permissions of new files (bnc#743355) +- 2.22.3 + +------------------------------------------------------------------- Thu Jan 5 15:08:14 CET 2012 - mvidner(a)suse.cz - Relicensed agent-process from GPL-2.0 to GPL-2.0+ -- 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] r67360 - in /branches/SuSE-Code-11-SP2-Branch/core: ./ agent-ini/src/ agent-ini/testsuite/multi/ package/
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 15:04:51 2012 New Revision: 67360 URL: http://svn.opensuse.org/viewcvs/yast?rev=67360&view=rev Log: ini-agent: only change permissions of new files (bnc#743355) *quick* adjustment of tests: only test creation, not yet the sssd.conf case of implicit existing private Removed: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.in.1 Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Modified: branches/SuSE-Code-11-SP2-Branch/core/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/core/VERSION Fri Feb 3 15:04:51 2012 @@ -1 +1 @@ -2.17.43 +2.17.44 Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/src/IniParser.cc Fri Feb 3 15:04:51 2012 @@ -1000,8 +1000,6 @@ mode_t file_umask = section.isPrivate()? 0077: 0022; mode_t orig_umask = umask(file_umask); - // rewriting an existing file wouldnt change its mode - unlink(filename.c_str()); ofstream of(filename.c_str()); if (!of.good()) { Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.err Fri Feb 3 15:04:51 2012 @@ -1,11 +1,11 @@ -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively 1 to .v."1"."Totalise"."Password" +[agent-ini] IniFile.cc(setValue):XXX Write: adding recursively Totalise to .v."1"."Totalise"."Password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."1"."Totalise"."Password" = "Secret password" [agent-ini] IniFile.cc(setMyValue):XXX Adding value .v."2"."arcor"."Password" = "Public password" -[agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.1.test to 1 [agent-ini] IniParser.cc(parse):XXX Rewriting multi/private.in.2.test to 2 -[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [agent-ini] IniParser.cc(getFileName):XXX Rewriting 2 to multi/private.in.2.test +[agent-ini] IniParser.cc(getFileName):XXX Rewriting 1 to multi/private.in.1.test [YCP] multi/private.ycp:XXX secret file mode: $["exit":0, "stderr":"", "stdout":"600\n"] [YCP] multi/private.ycp:XXX public file mode: $["exit":0, "stderr":"", "stdout":"644\n"] [agent-ini] IniParser.cc(write):XXX File multi/private.in.*.test did not change. Not saving. Modified: branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out (original) +++ branches/SuSE-Code-11-SP2-Branch/core/agent-ini/testsuite/multi/private.out Fri Feb 3 15:04:51 2012 @@ -1,16 +1,8 @@ (nil) multi/private.in.1.test ------------------------------- [Dialer Totalise] - Compuserve = 0 - Provider = Totalise - Phone = 08453001470 Password = Secret password [End] - -[Dialer force9] - Provider = Force9 - Phone = 08451424000 -[End] multi/private.in.2.test ------------------------------- [Dialer arcor] Compuserve = 0 Modified: branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/core/… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/core/package/yast2-core.changes Fri Feb 3 15:04:51 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 3 14:36:31 CET 2012 - mvidner(a)suse.cz + +- ini-agent: only change permissions of new files (bnc#743355) +- 2.17.44 + +------------------------------------------------------------------- Thu Jan 5 15:08:14 CET 2012 - mvidner(a)suse.cz - Relicensed agent-process from GPL-2.0 to GPL-2.0+ -- 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] r67359 - in /branches/SuSE-Code-11-SP2-Branch/network: VERSION package/yast2-network.changes src/modules/LanItems.ycp
by mvidner＠svn2.opensuse.org 03 Feb '12

03 Feb '12

Author: mvidner Date: Fri Feb 3 13:58:55 2012 New Revision: 67359 URL: http://svn.opensuse.org/viewcvs/yast?rev=67359&view=rev Log: Fix detection of properly configured LCS and CTC devices (bnc#741071#c25) Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Fri Feb 3 13:58:55 2012 @@ -1 +1 @@ -2.17.170 +2.17.171 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Fri Feb 3 13:58:55 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 3 13:52:59 CET 2012 - mvidner(a)suse.cz + +- Fix detection of properly configured LCS and CTC devices (bnc#741071#c20) +- 2.17.171 + +------------------------------------------------------------------- Thu Jan 26 16:05:05 CET 2012 - mvidner(a)suse.cz - Only save LLADDR (persistent MAC) for some s390 card types, Modified: branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/modules/LanItems.ycp Fri Feb 3 13:58:55 2012 @@ -1508,23 +1508,20 @@ case "qeth": case "hsi": string portnumber_param = (size(qeth_portnumber)>0) ? sformat("-n %1", qeth_portnumber) : ""; -/* - if (size(chan_mode)>0) - // chan_ids (read, write, control), port - command1=sformat("qeth_configure %1 -p %2 %3 %4 1", qeth_layer2?"-l":"", chan_mode, portnumber_param, qeth_chanids); - else - command1=sformat("qeth_configure %1 %2 %3 1", qeth_layer2?"-l":"", portnumber_param, qeth_chanids); -*/ string portname_param=(size(chan_mode)>0) ? sformat("-p %1", chan_mode) : ""; string options_param=(size(qeth_options)>0) ? sformat("-o %1", qeth_options) : ""; command1=sformat("qeth_configure %1 %2 %3 %4 %5 1", options_param, (qeth_layer2==true)?"-l":"", portname_param, portnumber_param, qeth_chanids); command2=sformat("ls /sys/devices/qeth/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "ctc": + // chan_ids (read, write), protocol + command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); + command2=sformat("ls /sys/devices/ctcm/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + break; case "lcs": // chan_ids (read, write), protocol command1=sformat("ctc_configure %1 1 %2", qeth_chanids, chan_mode); - command2=sformat("ls /sys/devices/cu3088/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); + command2=sformat("ls /sys/devices/lcs/%1/net/|head -n1|tr -d '\n'", (splitstring(qeth_chanids, " "))[0]:""); break; case "iucv": // router -- 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] r67358 - /tags/branch-Code-11-SP2-2_17_33/iscsi-client/
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 18:35:11 2012 New Revision: 67358 URL: http://svn.opensuse.org/viewcvs/yast?rev=67358&view=rev Log: Created tag branch-Code-11-SP2-2_17_33 for iscsi-client Added: tags/branch-Code-11-SP2-2_17_33/iscsi-client/ (props changed) - copied from r67357, branches/SuSE-Code-11-SP2-Branch/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] r67357 - in /branches/SuSE-Code-11-SP2-Branch/storage: VERSION package/yast2-storage.changes
by aschnell＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: aschnell Date: Thu Feb 2 18:10:02 2012 New Revision: 67357 URL: http://svn.opensuse.org/viewcvs/yast?rev=67357&view=rev Log: - increased version Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Thu Feb 2 18:10:02 2012 @@ -1 +1 @@ -2.17.125 +2.17.126 Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Thu Feb 2 18:10:02 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Tue Jan 31 14:47:10 CET 2012 - aschnell(a)suse.de +- 2.17.126 - add by-id names to alt-names of DmPartCo (bnc#744194) ------------------------------------------------------------------- -- 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] r67356 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: VERSION package/yast2-iscsi-client.changes
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 17:09:27 2012 New Revision: 67356 URL: http://svn.opensuse.org/viewcvs/yast?rev=67356&view=rev Log: version 2.17.33 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/VERSION Thu Feb 2 17:09:27 2012 @@ -1 +1 @@ -2.17.32 +2.17.33 Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Thu Feb 2 17:09:27 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de +- 2.17.33 - call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) ------------------------------------------------------------------- -- 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] r67355 - in /branches/SuSE-Code-11-SP2-Branch/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 16:06:17 2012 New Revision: 67355 URL: http://svn.opensuse.org/viewcvs/yast?rev=67355&view=rev Log: call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes Thu Feb 2 16:06:17 2012 @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de + +- call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) + +------------------------------------------------------------------- +Wed Feb 1 19:34:51 CET 2012 - fehr(a)suse.de - create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Thu Feb 2 16:06:17 2012 @@ -381,7 +381,7 @@ } ret = writeInitiatorName(initiatorname); } else { - y2internal("initiatorname=%1", initiatorname); + y2milestone("checkInitiatorName initiatorname=%1", initiatorname); if (size(name_from_bios)>0 && name_from_bios!=initiatorname) { Popup::Warning( _("InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt> differ. @@ -661,18 +661,26 @@ { iface_file = $[]; list<string> files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); - y2milestone( "files:%1", files ); + y2milestone( "InitIfaceFile files:%1", files ); + if( files==nil || size(files)==0 ) + { + string cmd = GetAdmCmd("-m iface"); + y2milestone( "InitIfaceFile cmd:%1", cmd ); + y2milestone( "InitIfaceFile ret:%1", SCR::Execute(.target.bash_output, cmd)); + files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); + y2milestone( "InitIfaceFile files:%1", files ); + } foreach( string file, files, { list<string> ls = splitstring( (string)SCR::Read(.target.string, "/etc/iscsi/ifaces/"+file), "\n" ); - y2milestone( "file:%1", file ); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile file:%1", file ); + y2milestone( "InitIfaceFile ls:%1", ls ); ls = filter( string l, ls, ``(search(l,"iface.iscsi_ifacename")!=nil)); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile ls:%1", ls ); if( size(ls)>0 ) iface_file[splitstring(deletechars(ls[0]:""," "),"=")[1]:""] = file; }); - y2milestone( "iface_file:%1", iface_file ); + y2milestone( "InitIfaceFile iface_file:%1", iface_file ); } global list<term> GetOffloadItems() -- 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] r67354 - in /trunk/iscsi-client: package/yast2-iscsi-client.changes src/IscsiClientLib.ycp
by fehr＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: fehr Date: Thu Feb 2 16:05:17 2012 New Revision: 67354 URL: http://svn.opensuse.org/viewcvs/yast?rev=67354&view=rev Log: call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes trunk/iscsi-client/src/IscsiClientLib.ycp 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 Thu Feb 2 16:05:17 2012 @@ -1,5 +1,10 @@ ------------------------------------------------------------------- -Mon Jan 30 19:14:16 CET 2012 - fehr(a)suse.de +Thu Feb 2 16:03:22 CET 2012 - fehr(a)suse.de + +- call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570) + +------------------------------------------------------------------- +Wed Feb 1 19:34:51 CET 2012 - fehr(a)suse.de - create /etc/iscsi to prevent crash if nonexistant (bnc#742570) - prevent calling getiBFT() before open-iscsi install (bnc#725833) Modified: trunk/iscsi-client/src/IscsiClientLib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.… ============================================================================== --- trunk/iscsi-client/src/IscsiClientLib.ycp (original) +++ trunk/iscsi-client/src/IscsiClientLib.ycp Thu Feb 2 16:05:17 2012 @@ -661,18 +661,26 @@ { iface_file = $[]; list<string> files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); - y2milestone( "files:%1", files ); + y2milestone( "InitIfaceFile files:%1", files ); + if( files==nil || size(files)==0 ) + { + string cmd = GetAdmCmd("-m iface"); + y2milestone( "InitIfaceFile cmd:%1", cmd ); + y2milestone( "InitIfaceFile ret:%1", SCR::Execute(.target.bash_output, cmd)); + files = (list<string>)SCR::Read(.target.dir, "/etc/iscsi/ifaces"); + y2milestone( "InitIfaceFile files:%1", files ); + } foreach( string file, files, { list<string> ls = splitstring( (string)SCR::Read(.target.string, "/etc/iscsi/ifaces/"+file), "\n" ); - y2milestone( "file:%1", file ); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile file:%1", file ); + y2milestone( "InitIfaceFile ls:%1", ls ); ls = filter( string l, ls, ``(search(l,"iface.iscsi_ifacename")!=nil)); - y2milestone( "ls:%1", ls ); + y2milestone( "InitIfaceFile ls:%1", ls ); if( size(ls)>0 ) iface_file[splitstring(deletechars(ls[0]:""," "),"=")[1]:""] = file; }); - y2milestone( "iface_file:%1", iface_file ); + y2milestone( "InitIfaceFile iface_file:%1", iface_file ); } global list<term> GetOffloadItems() -- 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] r67353 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: gs Date: Thu Feb 2 15:39:12 2012 New Revision: 67353 URL: http://svn.opensuse.org/viewcvs/yast?rev=67353&view=rev Log: handle tabs inside <pre> correctly Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Thu Feb 2 15:39:12 2012 @@ -355,11 +355,12 @@ NCtext ftext( nctxt ); int len = textWidth( wtxt ); - + if ( cc + len > textwidth ) { textwidth = cc + len; - AdjustPad( wsze(cl+ftext.Lines(), textwidth) ); + AdjustPad( wsze(cl + ftext.Lines(), textwidth) ); + yuiDebug() << "Adjust: " << cl+ftext.Lines() << " " << textwidth << endl; } // insert the text @@ -368,8 +369,10 @@ while ( *sch ) { myPad()->addwstr( sch, 1 ); // add one wide chararacter - cc += wcwidth( *sch ); + if ( iswprint( *sch ) ) + cc += wcwidth( *sch ); // wcwidth for \t returns -1 + ++sch; } } @@ -465,12 +468,24 @@ } else { - if ( *wch != L'\r' ) // skip carriage return + switch ( *wch ) { - myPad()->addwstr( wch, 1 ); // add the wide chararacter - cc += wcwidth( *wch ); - if ( *wch == '\n' ) - PadNL(); + case L' ': // add white space + myPad()->addwstr( wch, 1 ); + cc+=wcwidth( *wch ); + break; + + case L'\n': + PadNL(); // add new line + break; + + case L'\t': // add tab + myPad()->addwstr( wch, 1 ); + cc += myPad()->tabsize(); + break; + + default: + yuiDebug() << "Ignoring " << *wch << endl; } ++wch; } @@ -506,7 +521,7 @@ PadBOL(); AdjustPad( wsze( cl, textwidth ) ); - yuiMilestone() << "adjust: lines: " << cl << " columns: " << textwidth << endl; + yuiDebug() << "Anchors: " << anchors.size() << endl; for ( unsigned i = 0; i < anchors.size(); ++i ) @@ -589,7 +604,8 @@ /** * Get the number of columns needed to print a 'wstring'. Only printable characters - * are taken into account because others would return -1 (e.g. '\n'). + * are taken into account because otherwise 'wcwidth' would return -1 (e.g. for '\n'). + * Tabs are calculated with tabsize(). * Attention: only use textWidth() to calculate space, not for iterating through a text * or to get the length of a text (real text length includes new lines). */ @@ -602,7 +618,13 @@ { // check whether char is printable if ( iswprint( *wstr_it ) ) - len += wcwidth( *wstr_it ); + { + len += wcwidth( *wstr_it ); + } + else if ( *wstr_it == '\t' ) + { + len += myPad()->tabsize(); + } } return len; -- 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] r67352 - /tags/stable-2_22_3/ldap-client/
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 15:09:26 2012 New Revision: 67352 URL: http://svn.opensuse.org/viewcvs/yast?rev=67352&view=rev Log: Created tag stable-2_22_3 for ldap-client Added: tags/stable-2_22_3/ldap-client/ - copied from r67351, trunk/ldap-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] r67351 - in /trunk/ldap-client: VERSION package/yast2-ldap-client.changes src/Ldap.ycp src/ui.ycp testsuite/tests/LDAPInit.out
by jsuchome＠svn2.opensuse.org 02 Feb '12

02 Feb '12

Author: jsuchome Date: Thu Feb 2 15:08:40 2012 New Revision: 67351 URL: http://svn.opensuse.org/viewcvs/yast?rev=67351&view=rev Log: - removed option to switch off TLS/SSL from UI - offered only SSSD in UI (fate#313143) - 2.22.3 Modified: trunk/ldap-client/VERSION trunk/ldap-client/package/yast2-ldap-client.changes trunk/ldap-client/src/Ldap.ycp trunk/ldap-client/src/ui.ycp trunk/ldap-client/testsuite/tests/LDAPInit.out Modified: trunk/ldap-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/VERSION?rev=67351&r1… ============================================================================== --- trunk/ldap-client/VERSION (original) +++ trunk/ldap-client/VERSION Thu Feb 2 15:08:40 2012 @@ -1 +1 @@ -2.22.2 +2.22.3 Modified: trunk/ldap-client/package/yast2-ldap-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/package/yast2-ldap-c… ============================================================================== --- trunk/ldap-client/package/yast2-ldap-client.changes (original) +++ trunk/ldap-client/package/yast2-ldap-client.changes Thu Feb 2 15:08:40 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 2 15:00:26 CET 2012 - jsuchome(a)suse.cz + +- removed option to switch off TLS/SSL from UI +- offered only SSSD in UI (fate#313143) +- 2.22.3 + +------------------------------------------------------------------- Thu Jan 19 14:56:43 CET 2012 - jsuchome(a)suse.cz - removed obsolete version 2 reference (fate#313143) Modified: trunk/ldap-client/src/Ldap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/Ldap.ycp?rev=673… ============================================================================== --- trunk/ldap-client/src/Ldap.ycp (original) +++ trunk/ldap-client/src/Ldap.ycp Thu Feb 2 15:08:40 2012 @@ -128,7 +128,7 @@ string old_base_dn = nil; boolean base_dn_changed = false; - global boolean ldap_tls = false; + global boolean ldap_tls = true; // CA certificates for server certificate verification // At least one of these are required if tls_checkpeer is "yes" Modified: trunk/ldap-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/src/ui.ycp?rev=67351… ============================================================================== --- trunk/ldap-client/src/ui.ycp (original) +++ trunk/ldap-client/src/ui.ycp Thu Feb 2 15:08:40 2012 @@ -179,6 +179,88 @@ } /** + * Popup for TLS/SSL related stuff + */ + boolean SSLConfiguration () { + + string tls_cacertdir = Ldap::tls_cacertdir; + string tls_cacertfile = Ldap::tls_cacertfile; + UI::OpenDialog (`opt (`decorated), `HBox (`HSpacing (1), `VBox( + `VSpacing (0.5), + `HSpacing (75), + `HBox ( + `InputField (`id (`tls_cacertdir), `opt (`hstretch), + // inputfield label + _("Cer&tificate Directory"), tls_cacertdir), + `VBox (`Bottom ( + // button label + `PushButton (`id(`br_tls_cacertdir), _("B&rowse")) + )) + ), + `HBox ( + `InputField (`id (`tls_cacertfile), `opt (`hstretch), + // inputfield label + _("CA Cert&ificate File"), tls_cacertfile), + `VBox (`Bottom ( + // button label + `PushButton (`id(`br_tls_cacertfile), _("Brows&e")) + )) + ), + `HBox ( + `InputField (`id (`url), `opt (`hstretch), + // inputfield label + _("CA Certificate URL for Download")), + `VBox (`Bottom ( + // push button label + `PushButton (`id(`import_cert), _("Do&wnload CA Certificate")) + )) + ), + `ButtonBox ( + `PushButton (`id(`ok), Label::OKButton()), + `PushButton (`id(`cancel), Label::CancelButton()) + ), + `VSpacing (0.5) + ), `HSpacing (1))); + symbol ret = `again; + do + { + ret = (symbol) UI::UserInput (); + if (ret == `br_tls_cacertdir) + { + string dir = UI::AskForExistingDirectory (tls_cacertdir, + // popup label + _("Choose the directory with certificates")); + if (dir != nil) + { + tls_cacertdir = dir; + UI::ChangeWidget (`id (`tls_cacertdir), `Value, dir); + } + } + if (ret == `br_tls_cacertfile) + { + string file = UI::AskForExistingFile (tls_cacertfile, "*.pem *.crt", + // popup label + _("Choose the certificate file")); + if (file != nil) + { + tls_cacertfile = file; + UI::ChangeWidget (`id (`tls_cacertfile), `Value, file); + } + } + } while (ret != `ok && ret != `cancel); + + UI::CloseDialog (); + + if (ret == `ok) + { + Ldap::tls_cacertfile = tls_cacertfile; + Ldap::tls_cacertdir = tls_cacertdir; + } + + return ret == `ok; + } + + /** * The main dialog for ldap-client configuration * @return `back, `next or `abort */ @@ -236,13 +318,13 @@ boolean installation = Stage::cont () && !contains (WFM::Args (), "from_users"); boolean start = Ldap::start || installation; - boolean sssd = Ldap::sssd; string base_dn = Ldap::GetBaseDN (); string server = Ldap::server; boolean ldap_tls = Ldap::ldap_tls || Ldap::sssd; // force TLS to true if sssd is used string tls_checkpeer = Ldap::tls_checkpeer; boolean login_enabled = Ldap::login_enabled; string certTmpFile = sformat ("%1/__LDAPcert.crt", Directory::tmpdir); + boolean ssl_changed = false; boolean autofs = Ldap::_start_autofs; term autofs_con = `Empty (); if (Ldap::_autofs_allowed) @@ -257,12 +339,17 @@ boolean mkhomedir = Ldap::mkhomedir; term mkhomedir_term = `VBox ( - Ldap::_autofs_allowed ? `VSpacing (0) : `VSpacing (0.5), `Left(`CheckBox(`id(`mkhomedir), // checkbox label _("C&reate Home Directory on Login"), mkhomedir )) ); + term disable_login_term = `VBox ( + `Left (`CheckBox (`id (`ldapnologin), + // checkbox label + _("Disable User &Logins"), !login_enabled + )) + ); term con = `VCenter (`HBox (`HSpacing (3), `VBox ( `VSpacing (0.5), @@ -276,18 +363,9 @@ _("Do &Not Use LDAP"), !start)), `Left(`RadioButton(`id(`ldapyes), `opt (`notify), // radio button label - _("&Use LDAP"), start)), - `Left(`RadioButton(`id(`ldapnologin), `opt (`notify), - // radio button label - _("Use LDAP but Disable &Logins"), - start && !login_enabled)) + _("&Use LDAP"), start)) ))) ), - `VSpacing (0.4), - `Left (`CheckBox (`id (`sssd), `opt (`notify), - // checkbox label - _("Use S&ystem Security Services Daemon (SSSD)"), sssd - )), `VSpacing (0.4) ))), `VSpacing (0.4), @@ -316,20 +394,16 @@ ), `VSpacing (0.4) ), `HSpacing (0.5))), - `Frame (_("Secure Connection"), `HBox (`HSpacing (0.5), `VBox( - `HBox ( - // check box label - `Left (`CheckBox (`id(`ldaps), `opt (`notify), _("LDAP &TLS/SSL"), ldap_tls)), - // push button label - `PushButton (`id(`import_cert), _("Do&wnload CA Certificate")) - ), - `VSpacing (0.2) - ), `HSpacing (0.5))), autofs_con, mkhomedir_term, - `VSpacing(0.4), - // pushbutton label - `PushButton (`id(`advanced), _("&Advanced Configuration...")) + disable_login_term, + `VSpacing (), + `HBox ( + // pushbutton label + `PushButton (`id(`ssl_config), _("SSL/TLS Configuration...")), + // pushbutton label + `PushButton (`id(`advanced), _("&Advanced Configuration...")) + ) ), `HSpacing (3))); Wizard::SetContentsButtons ( @@ -345,9 +419,6 @@ UI::ChangeWidget (`id(`server),`ValidChars, Address::ValidChars + " "); - UI::ChangeWidget (`id(`import_cert),`Enabled, ldap_tls); - // do not alow to turn off TLS when SSSD is used - UI::ChangeWidget (`id (`ldaps), `Enabled, !sssd); symbol result = `not_next; do { @@ -355,20 +426,15 @@ any rb = UI::QueryWidget(`id(`rd), `CurrentButton); start = (rb != `ldapno); - login_enabled = (rb != `ldapnologin); + login_enabled = UI::QueryWidget (`id (`ldapnologin), `Value) != true; - sssd = (boolean) UI::QueryWidget (`id (`sssd), `Value); server = (string) UI::QueryWidget(`id(`server), `Value); - ldap_tls = (boolean) UI::QueryWidget(`id(`ldaps), `Value); mkhomedir = (boolean) UI::QueryWidget (`id(`mkhomedir),`Value); - UI::ChangeWidget (`id(`import_cert), `Enabled, ldap_tls); - - if (result == `sssd) - { - UI::ChangeWidget (`id (`ldaps), `Value, true); - UI::ChangeWidget (`id (`ldaps), `Enabled, !sssd); - } + if (result == `ssl_config) + { + ssl_changed = SSLConfiguration () || ssl_changed; + } if (result == `slp) { string srv = ""; @@ -538,7 +604,7 @@ } } - list<string> needed_packages = sssd ? Ldap::sssd_packages : Ldap::pam_nss_packages; + list<string> needed_packages = Ldap::sssd_packages; if (Ldap::sssd_with_krb) needed_packages = (list<string>) union (needed_packages, Ldap::kerberos_packages); @@ -587,19 +653,12 @@ if (result == `next || result == `advanced) { - if (Ldap::GetBaseDN() != base_dn && - Ldap::nss_base_passwd == Ldap::GetBaseDN ()) - { - Ldap::nss_base_passwd = base_dn; - Ldap::nss_base_shadow = base_dn; - Ldap::nss_base_group = base_dn; - } if (Ldap::start != start || Ldap::GetBaseDN() != base_dn || Ldap::server != server || Ldap::ldap_tls != ldap_tls || Ldap::_start_autofs != autofs || Ldap::login_enabled != login_enabled || Ldap::mkhomedir != mkhomedir || - Ldap::sssd != sssd + ssl_changed ) { if (result == `next) @@ -655,7 +714,6 @@ Ldap::_start_autofs = autofs; Ldap::login_enabled = login_enabled; Ldap::mkhomedir = mkhomedir; - Ldap::sssd = sssd; Ldap::modified = true; } } @@ -674,19 +732,11 @@ // help text caption 1 _("Advanced LDAP Client Settings") + - (Ldap::sssd ? - // help text 1/3 _("If Kerberos authentication should be used, specify the realm and KDC Address. Determine if user credentials should be cached locally by checking SSSD Offline Authentication. For more info about SSSD settings, check the man page of <tt>sssd.conf</tt>. -") : - - // help text 1/3 - _("Specify the search bases to use for specific maps (users, passwords, and groups) if they are different from the base DN. These values are -set to the nss_base_passwd, nss_base_shadow, and nss_base_group attributes -in /etc/ldap.conf file. -")) + +") + // help text 2/3 _("Password Change Protocol refers to the pam_password attribute of the\n<tt>/etc/ldap.conf</tt> file. See <tt>man pam_ldap</tt> for an explanation of its values.") + @@ -754,12 +804,7 @@ string base_config_dn = Ldap::GetMainConfigDN(); boolean create_ldap = Ldap::create_ldap; boolean append_base = (bind_dn != "" && issubstring (bind_dn, base_dn)); - string nss_base_passwd = Ldap::nss_base_passwd; - string nss_base_shadow = Ldap::nss_base_shadow; - string nss_base_group = Ldap::nss_base_group; string pam_password = Ldap::pam_password; - string tls_cacertdir = Ldap::tls_cacertdir; - string tls_cacertfile = Ldap::tls_cacertfile; string krb5_realm = Ldap::krb5_realm; string krb5_kdcip = Ldap::krb5_kdcip; boolean sssd_with_krb = Ldap::sssd_with_krb; @@ -885,61 +930,25 @@ ); } - term get_frame_nss () { - return - // frame label - `Frame (_("Naming Contexts"), `HBox( - `HSpacing (1), `VBox( - `VSpacing(0.4), - `HBox ( - `InputField (`id (`nss_base_passwd), `opt (`hstretch), - // textentry label - _("&User Map"), nss_base_passwd), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_passwd), _("&Browse")) - ) - ), - `HBox ( - `InputField (`id (`nss_base_shadow), `opt (`hstretch), - // textentry label - _("&Password Map"), nss_base_shadow), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_shadow), _("Brow&se")) - ) - ), - `HBox ( - `InputField (`id (`nss_base_group), `opt (`hstretch), - // textentry label - _("&Group Map"), nss_base_group), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_group), _("Bro&wse")) - ) - ), - `VSpacing(0.4) - ), - `HSpacing (1) - )); - } - term get_frame_krb () { - return - // frame label - `Frame (_("Basic SSSD Settings"), `HBox (`HSpacing (1), `VBox ( + + define void set_client_term () { + + + term cont = `Top (`HBox(`HSpacing (4), `VBox( + `VSpacing (1), + // checkbox label `Left (`CheckBox (`id (`sssd_with_krb), `opt (`notify), _("&Use Kerberos"), sssd_with_krb)), `VSpacing(0.4), `HBox ( + `HSpacing (2), // textentry label `TextEntry (`id (`krb5_realm), _("Default Real&m"), krb5_realm), // textentry label `TextEntry (`id (`krb5_kdcip), _("&KDC Server Address"), krb5_kdcip) ), + `VSpacing (), // combobox label `ComboBox (`id (`sssd_ldap_schema), `opt (`notify, `hstretch), _("LDAP Schema"), maplist (string s, ldap_schemas, ``(`item (`id (s), s, s == sssd_ldap_schema))) @@ -958,46 +967,15 @@ `Left (`CheckBox (`id (`sssd_cache_credentials), _("SSSD O&ffline Authentication"), sssd_cache_credentials)) ), - `VSpacing (0.4) - ), `HSpacing (1))); - } - - define void set_client_term () { - term cont = `Top (`HBox(`HSpacing (5), `VBox( - `VSpacing(0.4), - `VBox (Ldap::sssd ? get_frame_krb () : get_frame_nss ()), - `VSpacing (0.4), + `VSpacing (), `ComboBox (`id (`pam_password), `opt(`notify,`hstretch,`editable), // combobox label _("Passwor&d Change Protocol"), pam_password_items), `ComboBox (`id (`group_style), `opt (`notify, `hstretch), // combobox label - _("Group Member &Attribute"), member_attributes), - // check box label - `VSpacing(0.4), - `HBox ( - `HWeight (1, `HBox ( - `InputField (`id (`tls_cacertdir), `opt (`hstretch), _("Cer&tificate Directory"), - tls_cacertdir - ), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_tls_cacertdir), _("B&rowse")) - ) - )), `HWeight (1, `HBox ( - `InputField (`id (`tls_cacertfile), `opt (`hstretch), _("CA Cert&ificate File"), - tls_cacertfile - ), - `VBox ( - `Label (""), - // button label - `PushButton (`id(`br_tls_cacertfile), _("Brows&e")) - ) - )) - ) - ), `HSpacing (5))); + _("Group Member &Attribute"), member_attributes) + ), `HSpacing (4))); UI::ReplaceWidget (`tabContents, cont); if (has_tabs) @@ -1011,7 +989,7 @@ define void set_admin_term () { - term cont = `HBox (`HSpacing (5), `VBox( + term cont = `HBox (`HSpacing (4), `VBox( `VSpacing (0.4), `HBox ( `InputField (`id (`base_config_dn), `opt (`hstretch), @@ -1061,7 +1039,7 @@ `HStretch () ), `VSpacing(0.4) - ), `HSpacing (5)); + ), `HSpacing (4)); UI::ReplaceWidget (`tabContents, cont); if (has_tabs) @@ -1103,32 +1081,18 @@ { member_attribute =(string)UI::QueryWidget(`id(`group_style),`Value); - if (Ldap::sssd) - { - krb5_realm = (string) + krb5_realm = (string) UI::QueryWidget (`id (`krb5_realm), `Value); - krb5_kdcip = (string) + krb5_kdcip = (string) UI::QueryWidget (`id (`krb5_kdcip), `Value); - sssd_cache_credentials = (boolean) + sssd_cache_credentials = (boolean) UI::QueryWidget (`id (`sssd_cache_credentials), `Value); - sssd_enumerate = (boolean) + sssd_enumerate = (boolean) UI::QueryWidget (`id (`sssd_enumerate), `Value); - sssd_ldap_schema= (string) + sssd_ldap_schema= (string) UI::QueryWidget (`id (`sssd_ldap_schema), `Value); - } - else - { - nss_base_passwd = (string) - UI::QueryWidget(`id(`nss_base_passwd),`Value); - nss_base_shadow = (string) - UI::QueryWidget(`id(`nss_base_shadow),`Value); - nss_base_group = (string) - UI::QueryWidget(`id(`nss_base_group),`Value); - } pam_password = (string) UI::QueryWidget(`id(`pam_password), `Value); - tls_cacertfile = (string) UI::QueryWidget(`id(`tls_cacertfile), `Value); - tls_cacertdir = (string) UI::QueryWidget(`id(`tls_cacertdir), `Value); } if (current == `admin) { @@ -1156,8 +1120,7 @@ } // 3. other events - if (is (result, symbol) && - contains ([`br, `br_passwd, `br_shadow, `br_group ], (symbol)result)) + if (result == `br) { if (Ldap::ldap_initialized && Ldap::tls_when_initialized != Ldap::ldap_tls) { @@ -1174,13 +1137,7 @@ ]); if (dn != "") { - map br2entry = $[ - `br : `base_config_dn, - `br_passwd : `nss_base_passwd, - `br_shadow : `nss_base_shadow, - `br_group : `nss_base_group - ]; - UI::ChangeWidget (`id(br2entry[result]:nil), `Value, dn); + UI::ChangeWidget (`id(`base_config_dn), `Value, dn); } } if (result == `sssd_with_krb) @@ -1189,24 +1146,6 @@ UI::ChangeWidget (`id (`krb5_realm), `Enabled, sssd_with_krb); UI::ChangeWidget (`id (`krb5_kdcip), `Enabled, sssd_with_krb); } - if (result == `br_tls_cacertdir) - { - string dir = UI::AskForExistingDirectory (tls_cacertdir, _("Choose the directory with certificates")); - if (dir != nil) - { - tls_cacertdir = dir; - UI::ChangeWidget (`id (`tls_cacertdir), `Value, dir); - } - } - if (result == `br_tls_cacertfile) - { - string file = UI::AskForExistingFile (tls_cacertfile, "*.pem *.crt", _("Choose the certificate file")); - if (file != nil) - { - tls_cacertfile = file; - UI::ChangeWidget (`id (`tls_cacertfile), `Value, file); - } - } if (result == `add) { string suffix = base_dn; @@ -1371,11 +1310,6 @@ Ldap::member_attribute != member_attribute || Ldap::create_ldap != create_ldap || Ldap::pam_password != pam_password || - Ldap::nss_base_passwd != nss_base_passwd || - Ldap::nss_base_group != nss_base_group || - Ldap::nss_base_shadow != nss_base_shadow || - Ldap::tls_cacertdir != tls_cacertdir || - Ldap::tls_cacertfile != tls_cacertfile || Ldap::krb5_realm != krb5_realm || Ldap::krb5_kdcip != krb5_kdcip || Ldap::sssd_cache_credentials != sssd_cache_credentials || @@ -1389,11 +1323,6 @@ Ldap::member_attribute = member_attribute; Ldap::create_ldap = create_ldap; Ldap::pam_password = pam_password; - Ldap::nss_base_passwd = nss_base_passwd; - Ldap::nss_base_group = nss_base_group; - Ldap::nss_base_shadow = nss_base_shadow; - Ldap::tls_cacertdir = tls_cacertdir; - Ldap::tls_cacertfile = tls_cacertfile; Ldap::krb5_realm = krb5_realm; Ldap::krb5_kdcip = krb5_kdcip; Ldap::sssd_with_krb = sssd_with_krb; Modified: trunk/ldap-client/testsuite/tests/LDAPInit.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-client/testsuite/tests/LDAP… ============================================================================== --- trunk/ldap-client/testsuite/tests/LDAPInit.out (original) +++ trunk/ldap-client/testsuite/tests/LDAPInit.out Thu Feb 2 15:08:40 2012 @@ -1,10 +1,10 @@ Dump ==== init (one server, no port set) ============== Dump ==== value of server: "localhost" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"yes"] true Return Dump ==== init (one server, nonsence port set) ======== Dump ==== value of server: "localhost:sdgfd#$" -Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"no"] true +Execute .ldap $["cacertdir":"", "cacertfile":"", "hostname":"localhost", "port":389, "use_tls":"yes"] true Return Dump ==== init (more servers set, TLS used) =========== Dump ==== value of server: "chimera.suse.cz:333 localhost" -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0