November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : don't pass if granting permissions fail (bnc#554946)
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/master commit f532a1964bfb867fdaf8332b1dae720c3f3a7023 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 10:53:35 2009 +0100 don't pass if granting permissions fail (bnc#554946) --- .../package/yast2-webservice-administrator.spec | 4 ++-- .../package/yast2-webservice-language.spec | 2 +- .../package/yast2-webservice-mailsettings.spec | 4 ++-- .../network/package/yast2-webservice-network.spec | 4 ++-- plugins/ntp/package/yast2-webservice-ntp.spec | 3 +++ .../patches/package/yast2-webservice-patches.spec | 2 +- .../package/yast2-webservice-registration.spec | 2 +- .../package/yast2-webservice-samba-server.spec | 12 ++---------- .../package/yast2-webservice-security.spec | 2 +- .../package/yast2-webservice-services.spec | 6 +++--- .../status/package/yast2-webservice-status.spec | 2 +- .../system/package/yast2-webservice-system.spec | 1 + plugins/time/package/yast2-webservice-time.spec | 4 ++-- plugins/users/package/yast2-webservice-users.spec | 2 +- 14 files changed, 23 insertions(+), 27 deletions(-) diff --git a/plugins/administrator/package/yast2-webservice-administrator.spec b/plugins/administrator/package/yast2-webservice-administrator.spec index 9a67356..e264cda 100644 --- a/plugins/administrator/package/yast2-webservice-administrator.spec +++ b/plugins/administrator/package/yast2-webservice-administrator.spec @@ -75,8 +75,8 @@ rm -rf $RPM_BUILD_ROOT %post # granting all permissions for the web user -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : -/usr/sbin/grantwebyastrights --user yastws --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null +/usr/sbin/grantwebyastrights --user yastws --action grant > /dev/null %postun diff --git a/plugins/language/package/yast2-webservice-language.spec b/plugins/language/package/yast2-webservice-language.spec index bdcaafe..9ed6491 100644 --- a/plugins/language/package/yast2-webservice-language.spec +++ b/plugins/language/package/yast2-webservice-language.spec @@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec index 09492f2..66bbf02 100644 --- a/plugins/mail_settings/package/yast2-webservice-mailsettings.spec +++ b/plugins/mail_settings/package/yast2-webservice-mailsettings.spec @@ -89,8 +89,8 @@ rm -rf $RPM_BUILD_ROOT %post # granting all permissions for the web user -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : -/usr/sbin/grantwebyastrights --user yastws --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null +/usr/sbin/grantwebyastrights --user yastws --action grant > /dev/null %postun diff --git a/plugins/network/package/yast2-webservice-network.spec b/plugins/network/package/yast2-webservice-network.spec index 3f705d8..c698f45 100644 --- a/plugins/network/package/yast2-webservice-network.spec +++ b/plugins/network/package/yast2-webservice-network.spec @@ -74,9 +74,9 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null # and for yastws -/usr/sbin/grantwebyastrights --user %{pkg_user} --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user %{pkg_user} --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/ntp/package/yast2-webservice-ntp.spec b/plugins/ntp/package/yast2-webservice-ntp.spec index c1920fe..ba25c72 100644 --- a/plugins/ntp/package/yast2-webservice-ntp.spec +++ b/plugins/ntp/package/yast2-webservice-ntp.spec @@ -71,6 +71,9 @@ cp %{SOURCE2} $RPM_BUILD_ROOT/usr/share/PolicyKit/policy/ rm -rf $RPM_BUILD_ROOT %post +# granting all permissions for the web user +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null +/usr/sbin/grantwebyastrights --user yastws --action grant > /dev/null %postun diff --git a/plugins/patches/package/yast2-webservice-patches.spec b/plugins/patches/package/yast2-webservice-patches.spec index 96912b4..e41c3bb 100644 --- a/plugins/patches/package/yast2-webservice-patches.spec +++ b/plugins/patches/package/yast2-webservice-patches.spec @@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/registration/package/yast2-webservice-registration.spec b/plugins/registration/package/yast2-webservice-registration.spec index 6e320aa..1d46400 100644 --- a/plugins/registration/package/yast2-webservice-registration.spec +++ b/plugins/registration/package/yast2-webservice-registration.spec @@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/samba_server/package/yast2-webservice-samba-server.spec b/plugins/samba_server/package/yast2-webservice-samba-server.spec index 874eacf..78bbd9a 100644 --- a/plugins/samba_server/package/yast2-webservice-samba-server.spec +++ b/plugins/samba_server/package/yast2-webservice-samba-server.spec @@ -57,18 +57,10 @@ rm -rf $RPM_BUILD_ROOT %post # grant the needed privileges to the server user -/usr/bin/polkit-auth --user %{pkg_user} --grant org.opensuse.yast.modules.yapi.samba.getalldirectories >& /dev/null || : -/usr/bin/polkit-auth --user %{pkg_user} --grant org.opensuse.yast.modules.yapi.samba.addshare >& /dev/null || : -/usr/bin/polkit-auth --user %{pkg_user} --grant org.opensuse.yast.modules.yapi.samba.editshare >& /dev/null || : -/usr/bin/polkit-auth --user %{pkg_user} --grant org.opensuse.yast.modules.yapi.samba.deleteshare >& /dev/null || : -/usr/bin/polkit-auth --user %{pkg_user} --grant org.opensuse.yast.modules.yapi.samba.getshare >& /dev/null || : +/usr/sbin/grantwebyastrights --user yastws --action grant > /dev/null # grant the needed privileges to root -/usr/bin/polkit-auth --user root --grant org.opensuse.yast.modules.yapi.samba.getalldirectories >& /dev/null || : -/usr/bin/polkit-auth --user root --grant org.opensuse.yast.modules.yapi.samba.addshare >& /dev/null || : -/usr/bin/polkit-auth --user root --grant org.opensuse.yast.modules.yapi.samba.editshare >& /dev/null || : -/usr/bin/polkit-auth --user root --grant org.opensuse.yast.modules.yapi.samba.deleteshare >& /dev/null || : -/usr/bin/polkit-auth --user root --grant org.opensuse.yast.modules.yapi.samba.getshare >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/securities/package/yast2-webservice-security.spec b/plugins/securities/package/yast2-webservice-security.spec index c2627f9..7876f00 100644 --- a/plugins/securities/package/yast2-webservice-security.spec +++ b/plugins/securities/package/yast2-webservice-security.spec @@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/services/package/yast2-webservice-services.spec b/plugins/services/package/yast2-webservice-services.spec index 3af420c..403c7bc 100644 --- a/plugins/services/package/yast2-webservice-services.spec +++ b/plugins/services/package/yast2-webservice-services.spec @@ -19,7 +19,7 @@ Release: 0 Summary: YaST2 - Webservice - Services Source: www.tar.bz2 Source1: org.opensuse.yast.modules.yapi.services.policy -Source2: YML.rb +Source2: YML.rb BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: rubygem-yast2-webservice-tasks rubygem-restility @@ -88,8 +88,8 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : -/usr/sbin/grantwebyastrights --user yastws --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null +/usr/sbin/grantwebyastrights --user yastws --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/status/package/yast2-webservice-status.spec b/plugins/status/package/yast2-webservice-status.spec index a78e8d2..fb1e1dc 100644 --- a/plugins/status/package/yast2-webservice-status.spec +++ b/plugins/status/package/yast2-webservice-status.spec @@ -76,7 +76,7 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null # # nslookup of static hostnames can result to an error. Due this error collectd diff --git a/plugins/system/package/yast2-webservice-system.spec b/plugins/system/package/yast2-webservice-system.spec index eb83c11..d1b31c6 100644 --- a/plugins/system/package/yast2-webservice-system.spec +++ b/plugins/system/package/yast2-webservice-system.spec @@ -65,6 +65,7 @@ rm -rf $RPM_BUILD_ROOT %post # granting all permissions for the web user +#FIXME don't silently fail polkit-auth --user %{pkg_user} --grant org.freedesktop.hal.power-management.shutdown >& /dev/null || true polkit-auth --user %{pkg_user} --grant org.freedesktop.hal.power-management.shutdown-multiple-sessions >& /dev/null || true polkit-auth --user %{pkg_user} --grant org.freedesktop.hal.power-management.reboot >& /dev/null || true diff --git a/plugins/time/package/yast2-webservice-time.spec b/plugins/time/package/yast2-webservice-time.spec index 2738aa8..dca7790 100644 --- a/plugins/time/package/yast2-webservice-time.spec +++ b/plugins/time/package/yast2-webservice-time.spec @@ -66,9 +66,9 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null # XXX not nice to get yastws all permissions, but now not better solution -/usr/sbin/grantwebyastrights --user yastws --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user yastws --action grant > /dev/null %files %defattr(-,root,root) diff --git a/plugins/users/package/yast2-webservice-users.spec b/plugins/users/package/yast2-webservice-users.spec index 6231d57..d494b2f 100644 --- a/plugins/users/package/yast2-webservice-users.spec +++ b/plugins/users/package/yast2-webservice-users.spec @@ -59,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null %files %defattr(-,root,root) -- 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] <rest-service> master : don't silently fail if granting permissions fail (bnc#554946)
by Josef Reidinger 30 Nov '09

30 Nov '09

ref: refs/heads/master commit 4190a4384614d5d84ed3d540c463765917c0b26c Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Mon Nov 30 10:36:23 2009 +0100 don't silently fail if granting permissions fail (bnc#554946) --- webservice/package/grantwebyastrights | 118 ++++++++++++++--------------- webservice/package/yast2-webservice.spec | 14 +++- 2 files changed, 67 insertions(+), 65 deletions(-) diff --git a/webservice/package/grantwebyastrights b/webservice/package/grantwebyastrights index 8ed63c7..2b0eb28 100755 --- a/webservice/package/grantwebyastrights +++ b/webservice/package/grantwebyastrights @@ -15,15 +15,16 @@ $debug = 0 def usage why STDERR.puts why + STDERR.puts "" STDERR.puts "Usage: grantwebyastrights --user <user> --action (show|grant|revoke)" - STDERR.puts "NOTE: This program should be run by user root" - STDERR.puts "" - STDERR.puts "This call grant/revoke ALL permissions for the YaST Webservice." - STDERR.puts "In order to grant/revoke single rights use:" - STDERR.puts "polkit-auth --user <user> (--grant|-revoke) <policyname>" - STDERR.puts "" - STDERR.puts "In order to show all possible permissions use:" - STDERR.puts "polkit-action" + STDERR.puts "NOTE: This program should be run by user root" + STDERR.puts "" + STDERR.puts "This call grant/revoke ALL permissions for the YaST Webservice." + STDERR.puts "In order to grant/revoke single rights use:" + STDERR.puts "polkit-auth --user <user> (--grant|-revoke) <policyname>" + STDERR.puts "" + STDERR.puts "In order to show all possible permissions use:" + STDERR.puts "polkit-action" exit 1 end @@ -36,70 +37,65 @@ user = nil action = nil -begin options.each do |opt, arg| case opt when "--user": user = arg when "--action": action = arg when "--debug": $debug += 1 else - STDERR.puts "Ignoring unrecognized option #{opt}" + usage "Unrecognized option #{opt}" end end -rescue -end $debug = nil if $debug == 0 -usage "excessive arguments" unless ARGV.empty? -usage "--user parameter missing" unless user -usage "--action parameter (show|grant|revoke) missing" unless action +usage "excessive arguments" unless ARGV.empty? +usage "user parameter missing" unless user +usage "action parameter (show|grant|revoke) missing" unless action -begin - SuseString = "org.opensuse.yast" - if action == "grant" - # run "polkit-action" to list all registered policies - IO.popen( "polkit-action", 'r+' ) do |pipe| - loop do - break if pipe.eof? - l = pipe.read - # polkit-action prints one policy per line - policies = l.split("\n") - # now 'blindly' grant org.opensuse.yast.* - policies.each do |policy| - if policy.include? SuseString and not policy.include? ".scr" - STDOUT.puts "granting: #{policy}" - command = "polkit-auth --user " + user + " --grant " + policy - unless system(command) - STDERR.puts "#{command} failed !" - end - end - end - end - end - else - command = "polkit-auth --user " + user + " --explicit" - IO.popen( command, 'r+' ) do |pipe| - loop do - break if pipe.eof? - l = pipe.read - case action - when "show" - STDOUT.puts l - when "revoke" - policies = l.split("\n") - policies.each do |policy| - if policy.include? SuseString and not policy.include? ".scr" - STDOUT.puts "revoking: #{policy}" - command = "polkit-auth --user " + user + " --revoke " + policy - unless system(command) - STDERR.puts "#{command} failed !" - end - end - end - end - end - end - end +SuseString = "org.opensuse.yast" + +def webyast_perm?(perm) + return (perm.include? SuseString) && (not perm.include? ".scr") +end + +def granted_perms(user) + perms = `polkit-auth --user '#{user}' --explicit` + raise "polkit-auth failed with ret code #{$?.exitstatus}. Output: #{perms}" unless $?.exitstatus.zero? + perms = perms.split "\n" + perms.reject! { |perm| not webyast_perm?(perm) } + return perms end +def webyast_perms + perms = `polkit-action` + raise "polkit-action failed with ret code #{$?.exitstatus}. Output: #{perms}" unless $?.exitstatus.zero? + perms = perms.split "\n" + perms.reject! { |perm| not webyast_perm?(perm) } + return perms +end + +begin + case action + when "grant" then + granted = granted_perms user + non_granted = webyast_perms.reject{ |perm| granted.include? perm } + non_granted.each do |policy| + STDOUT.puts "granting: #{policy}" + out = `polkit-auth --user '#{user}' --grant '#{policy}'` + raise "Granting permissions failed with ret code #{$?.exitstatus}. Output: #{out}" unless $?.exitstatus.zero? + end + when "show" + STDOUT.puts granted_perms(user).join("\n") + when "revoke" + granted = granted_perms user + granted.each do |policy| + STDOUT.puts "revoking: #{policy}" + out = `polkit-auth --user '#{user}' --revoke '#{policy}'` + raise "Revoking permissions failed with ret code #{$?.exitstatus}. Output: #{out}" unless $?.exitstatus.zero? + end + end +rescue Exception => e + STDERR.puts e.message + Process.exit! 1 +end diff --git a/webservice/package/yast2-webservice.spec b/webservice/package/yast2-webservice.spec index 2fb7ad1..07cd732 100644 --- a/webservice/package/yast2-webservice.spec +++ b/webservice/package/yast2-webservice.spec @@ -162,13 +162,19 @@ rm -rf $RPM_BUILD_ROOT # #granting permissions for yastws # -/usr/bin/polkit-auth --user yastws --grant org.freedesktop.packagekit.system-update >& /dev/null || : -/usr/bin/polkit-auth --user yastws --grant org.freedesktop.policykit.read >& /dev/null || : -/usr/bin/polkit-auth --user yastws --grant org.opensuse.yast.module-manager.import >& /dev/null || : +if [ `/usr/bin/polkit-auth --user yastws | grep -c "org.freedesktop.packagekit.system-update"` -eq 0 ]; then + /usr/bin/polkit-auth --user yastws --grant org.freedesktop.packagekit.system-update > /dev/null +fi +if [ `/usr/bin/polkit-auth --user yastws | grep -c "org.freedesktop.policykit.read"` -eq 0 ]; then + /usr/bin/polkit-auth --user yastws --grant org.freedesktop.policykit.read > /dev/null +fi +if [ `/usr/bin/polkit-auth --user yastws | grep -c "org.opensuse.yast.module-manager.import"` -eq 0 ]; then + /usr/bin/polkit-auth --user yastws --grant org.opensuse.yast.module-manager.import > /dev/null +fi # # granting all permissions for root # -/usr/sbin/grantwebyastrights --user root --action grant >& /dev/null || : +/usr/sbin/grantwebyastrights --user root --action grant > /dev/null # # create database # -- 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] r59854 - /tags/branch-Code-11-SP1-2_17_5/ftp-server/
by juhliarik＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: juhliarik Date: Mon Nov 30 10:27:43 2009 New Revision: 59854 URL: http://svn.opensuse.org/viewcvs/yast?rev=59854&view=rev Log: Created tag branch-Code-11-SP1-2_17_5 for ftp-server Added: tags/branch-Code-11-SP1-2_17_5/ftp-server/ (props changed) - copied from r59853, branches/SuSE-Code-11-SP1-Branch/ftp-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] r59853 - in /branches/SuSE-Code-11-SP1-Branch/ftp-server: VERSION package/yast2-ftp-server.changes src/ftp-server.ycp src/write_load.ycp
by juhliarik＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: juhliarik Date: Mon Nov 30 10:27:36 2009 New Revision: 59853 URL: http://svn.opensuse.org/viewcvs/yast?rev=59853&view=rev Log: added fixes for typo and parsing port range in pure-ftpd Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/VERSION Mon Nov 30 10:27:36 2009 @@ -1 +1 @@ -2.17.4 +2.17.5 Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/package/yast2-ftp-server.changes Mon Nov 30 10:27:36 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 30 10:26:55 CET 2009 - juhliarik(a)suse.cz + +- added fix for typo (bnc#525007) +- added fir parsing port range in pure-ftpd (bnc#541557) +- 2.17.5 + +------------------------------------------------------------------- Tue Feb 03 14:34:18 CEST 2008 - juhliarik(a)suse.cz - selected text for translation (bnc #446659) Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/src/ftp-server.ycp Mon Nov 30 10:27:36 2009 @@ -383,7 +383,7 @@ FtpServer::EDIT_SETTINGS["FtpDirAnon"] = value; } else { CommandLine::Error(_("Option is empty.")); - CommandLine::Print(_("Example of correct imput set_anon_dir=/srv/ftp")); + CommandLine::Print(_("Example of correct input set_anon_dir=/srv/ftp")); CommandLine::Print(""); } } @@ -408,7 +408,7 @@ FtpServer::EDIT_SETTINGS["FtpDirLocal"] = value; } else { CommandLine::Error(_("Option is empty.")); - CommandLine::Print(_("Example of correct imput set_authen_dir=/srv/ftp")); + CommandLine::Print(_("Example of correct input set_authen_dir=/srv/ftp")); CommandLine::Print(""); } } Modified: branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ftp-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ftp-server/src/write_load.ycp Mon Nov 30 10:27:36 2009 @@ -509,7 +509,7 @@ ports = add(ports, FtpServer::EDIT_SETTINGS["PasMaxPort"]:nil); if (size(ports) == 2) { string val = ports[0]:nil; - val = val+" "; + val = val+":"; val = val+ports[1]:nil; FtpServer::PURE_SETTINGS["PassivePortRange"] = val; } @@ -519,7 +519,7 @@ } else { if (haskey(FtpServer::PURE_SETTINGS, "PassivePortRange")) { - ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil," "); + ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil,":"); if (size(ports)==2) return ports[0]:""; } 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] r59852 - in /trunk/yast2: library/modules/Linuxrc.ycp package/yast2.changes
by locilka＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: locilka Date: Mon Nov 30 10:27:15 2009 New Revision: 59852 URL: http://svn.opensuse.org/viewcvs/yast?rev=59852&view=rev Log: Fixed access rights for /etc/install.inf (bnc #500124) Modified: trunk/yast2/library/modules/Linuxrc.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/modules/Linuxrc.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Linuxrc.yc… ============================================================================== --- trunk/yast2/library/modules/Linuxrc.ycp (original) +++ trunk/yast2/library/modules/Linuxrc.ycp Mon Nov 30 10:27:15 2009 @@ -148,9 +148,11 @@ if (root != nil && root != "" && root != "/") { if (WFM::Read (.local.size, inst_if_file) != -1) { y2milestone ("Copying %1 to %2", inst_if_file, root); - WFM::Execute (.local.bash, sformat ( - "grep -v '^Sourcemounted' '%1' > %2/%1; chmod 0600 %1", inst_if_file, root - )); + if ((integer) WFM::Execute (.local.bash, sformat ( + "grep -vi '^Sourcemounted' '%1' > %2/%1; chmod 0600 %2/%1", inst_if_file, root + )) != 0) { + y2error ("Cannot SaveInstallInf %1 to %2", inst_if_file, root); + } } else { y2error ("Can't SaveInstallInf, file %1 doesn't exist", inst_if_file); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Nov 30 10:27:15 2009 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Nov 26 19:40:24 CET 2009 - locilka(a)suse.cz + +- Fixed access rights for /etc/install.inf (bnc #500124) + +------------------------------------------------------------------- Thu Nov 26 18:10:42 CET 2009 - kmachalkova(a)suse.cz - Fixed striping trailing \n from Hostname::CurrentHostname() -- 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] r59851 - /branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: kmachalkova Date: Mon Nov 30 10:20:16 2009 New Revision: 59851 URL: http://svn.opensuse.org/viewcvs/yast?rev=59851&view=rev Log: changes Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Mon Nov 30 10:20:16 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Nov 26 17:41:36 CET 2009 - kmachalkova(a)suse.cz + +- With enabled SuSEFirewall, set SuSEFirewall's FW_ROUTE variable + when enabling/disabling IP forwarding in routing settings. This + avoids overwriting sysctl variables by SuSEFirewall init scripts + (bnc#474304) + +------------------------------------------------------------------- Wed Nov 25 17:21:41 CET 2009 - mzugec(a)suse.de - added testsuites for YaPI -- 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] r59850 - /tags/stable-2_19_1/irda/
by jsuchome＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsuchome Date: Mon Nov 30 10:04:33 2009 New Revision: 59850 URL: http://svn.opensuse.org/viewcvs/yast?rev=59850&view=rev Log: Created tag stable-2_19_1 for irda Added: tags/stable-2_19_1/irda/ - copied from r59849, trunk/irda/ -- 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] r59849 - in /trunk/irda: VERSION package/yast2-irda.changes src/Irda.ycp src/ui.ycp testsuite/tests/Write.out
by jsuchome＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: jsuchome Date: Mon Nov 30 10:04:27 2009 New Revision: 59849 URL: http://svn.opensuse.org/viewcvs/yast?rev=59849&view=rev Log: - save baud rate (bnc#558525) - 2.19.1 Modified: trunk/irda/VERSION trunk/irda/package/yast2-irda.changes trunk/irda/src/Irda.ycp trunk/irda/src/ui.ycp trunk/irda/testsuite/tests/Write.out Modified: trunk/irda/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/VERSION?rev=59849&r1=59848&… ============================================================================== --- trunk/irda/VERSION (original) +++ trunk/irda/VERSION Mon Nov 30 10:04:27 2009 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/irda/package/yast2-irda.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/package/yast2-irda.changes?… ============================================================================== --- trunk/irda/package/yast2-irda.changes (original) +++ trunk/irda/package/yast2-irda.changes Mon Nov 30 10:04:27 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 27 08:28:57 CET 2009 - jsuchome(a)suse.cz + +- save baud rate (bnc#558525) +- 2.19.1 + +------------------------------------------------------------------- Thu Nov 26 16:20:52 CET 2009 - jsuchome(a)suse.cz - check for `ok dialog return value (bnc#558525) Modified: trunk/irda/src/Irda.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/src/Irda.ycp?rev=59849&r1=5… ============================================================================== --- trunk/irda/src/Irda.ycp (original) +++ trunk/irda/src/Irda.ycp Mon Nov 30 10:04:27 2009 @@ -107,8 +107,12 @@ if (port != "") { SCR::Write (.sysconfig.irda.IRDA_PORT, port); - SCR::Write (.sysconfig.irda, nil); } + if (max_baud_rate != nil) + { + SCR::Write (.sysconfig.irda.IRDA_MAX_BAUD_RATE, max_baud_rate); + } + SCR::Write (.sysconfig.irda, nil); Progress::NextStage (); Modified: trunk/irda/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/src/ui.ycp?rev=59849&r1=598… ============================================================================== --- trunk/irda/src/ui.ycp (original) +++ trunk/irda/src/ui.ycp Mon Nov 30 10:04:27 2009 @@ -25,9 +25,9 @@ * @param port the serial port use for IrDA * (to see if it was changed and service needs to be restarted) */ -define boolean TestPopup (string port) { +define boolean TestPopup (string port, string baud_rate) { - boolean modified = port != Irda::port; + boolean modified = port != Irda::port || baud_rate != Irda::max_baud_rate; // if service was originaly started boolean orig_start = false; @@ -44,15 +44,16 @@ { // 1. save new configuration SCR::Write (.sysconfig.irda.IRDA_PORT, port); + SCR::Write (.sysconfig.irda.IRDA_MAX_BAUD_RATE, baud_rate); SCR::Write (.sysconfig.irda, nil); } // 2. start/restart the service // when module cannot be loaded, Runlevel returns 0 -> use target.bash if (!orig_start) - out = (map) SCR::Execute (.target.bash_output, "rcirda start"); + out = Service::RunInitScriptOutput ("irda", "start"); else if (modified) - out = (map) SCR::Execute (.target.bash_output, "rcirda restart"); + out = Service::RunInitScriptOutput ("irda", "restart"); return out["stderr"]:""; } @@ -66,6 +67,7 @@ if (modified) { SCR::Write (.sysconfig.irda.IRDA_PORT, Irda::port); + SCR::Write (.sysconfig.irda.IRDA_MAX_BAUD_RATE, Irda::max_baud_rate); SCR::Write (.sysconfig.irda, nil); } @@ -308,7 +310,7 @@ } if (ret == `test) { - TestPopup (port); + TestPopup (port, baud_rate); } } while (!contains ([`back, `abort, `cancel, `next, `ok], ret)); Modified: trunk/irda/testsuite/tests/Write.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/testsuite/tests/Write.out?r… ============================================================================== --- trunk/irda/testsuite/tests/Write.out (original) +++ trunk/irda/testsuite/tests/Write.out Mon Nov 30 10:04:27 2009 @@ -1,6 +1,8 @@ Dump ==== nothing modified: ===================== Return true Dump ==== stop irda: ============================ +Write .sysconfig.irda.IRDA_MAX_BAUD_RATE "0" true +Write .sysconfig.irda nil true Read .init.scripts.exists "irda" true Execute .target.bash_output "/etc/init.d/irda stop" $["TERM":"raw"] $["exit":0] Read .init.scripts.exists "irda" true @@ -12,6 +14,7 @@ Return true Dump ==== start irda, create link: ============== Write .sysconfig.irda.IRDA_PORT "new_port" true +Write .sysconfig.irda.IRDA_MAX_BAUD_RATE "0" true Write .sysconfig.irda nil true Read .init.scripts.exists "irda" true Execute .target.bash_output "/etc/init.d/irda stop" $["TERM":"raw"] $["exit":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] r59848 - /tags/stable-2_18_1/ftp-server/
by juhliarik＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: juhliarik Date: Mon Nov 30 09:47:16 2009 New Revision: 59848 URL: http://svn.opensuse.org/viewcvs/yast?rev=59848&view=rev Log: Created tag stable-2_18_1 for ftp-server Added: tags/stable-2_18_1/ftp-server/ - copied from r59847, trunk/ftp-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] r59847 - in /trunk/ftp-server: VERSION package/yast2-ftp-server.changes src/ftp-server.ycp src/write_load.ycp
by juhliarik＠svn.opensuse.org 30 Nov '09

30 Nov '09

Author: juhliarik Date: Mon Nov 30 09:47:07 2009 New Revision: 59847 URL: http://svn.opensuse.org/viewcvs/yast?rev=59847&view=rev Log: added fixes and new version 2.18.1 Modified: trunk/ftp-server/VERSION trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/ftp-server.ycp trunk/ftp-server/src/write_load.ycp Modified: trunk/ftp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/VERSION?rev=59847&r1=… ============================================================================== --- trunk/ftp-server/VERSION (original) +++ trunk/ftp-server/VERSION Mon Nov 30 09:47:07 2009 @@ -1 +1 @@ -2.18.0 +2.18.1 Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-ser… ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Mon Nov 30 09:47:07 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Nov 30 09:36:55 CET 2009 - juhliarik(a)suse.cz + +- added fix for typo (bnc#525007) +- added fir parsing port range in pure-ftpd (bnc#541557) +- 2.18.1 + +------------------------------------------------------------------- Wed Feb 11 14:36:11 CET 2009 - juhliarik(a)suse.de - deleted unecessary Back button (bnc#440531) Modified: trunk/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/ftp-server.ycp?re… ============================================================================== --- trunk/ftp-server/src/ftp-server.ycp (original) +++ trunk/ftp-server/src/ftp-server.ycp Mon Nov 30 09:47:07 2009 @@ -383,7 +383,7 @@ FtpServer::EDIT_SETTINGS["FtpDirAnon"] = value; } else { CommandLine::Error(_("Option is empty.")); - CommandLine::Print(_("Example of correct imput set_anon_dir=/srv/ftp")); + CommandLine::Print(_("Example of correct input set_anon_dir=/srv/ftp")); CommandLine::Print(""); } } @@ -408,7 +408,7 @@ FtpServer::EDIT_SETTINGS["FtpDirLocal"] = value; } else { CommandLine::Error(_("Option is empty.")); - CommandLine::Print(_("Example of correct imput set_authen_dir=/srv/ftp")); + CommandLine::Print(_("Example of correct input set_authen_dir=/srv/ftp")); CommandLine::Print(""); } } Modified: trunk/ftp-server/src/write_load.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/write_load.ycp?re… ============================================================================== --- trunk/ftp-server/src/write_load.ycp (original) +++ trunk/ftp-server/src/write_load.ycp Mon Nov 30 09:47:07 2009 @@ -509,7 +509,7 @@ ports = add(ports, FtpServer::EDIT_SETTINGS["PasMaxPort"]:nil); if (size(ports) == 2) { string val = ports[0]:nil; - val = val+" "; + val = val+":"; val = val+ports[1]:nil; FtpServer::PURE_SETTINGS["PassivePortRange"] = val; } @@ -519,7 +519,7 @@ } else { if (haskey(FtpServer::PURE_SETTINGS, "PassivePortRange")) { - ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil," "); + ports = splitstring(FtpServer::PURE_SETTINGS["PassivePortRange"]:nil,":"); if (size(ports)==2) return ports[0]:""; } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0