Author: lslezak Date: Mon May 28 07:21:56 2007 New Revision: 38151 URL: http://svn.opensuse.org/viewcvs/yast?rev=38151&view=rev Log: - check UID after evaluating command line arguments (#269909) - 2.15.3 Modified: trunk/sysconfig/VERSION trunk/sysconfig/package/yast2-sysconfig.changes trunk/sysconfig/src/sysconfig.ycp trunk/sysconfig/src/wizards.ycp Modified: trunk/sysconfig/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/VERSION?rev=38151&r1=38150&r2=38151&view=diff ============================================================================== --- trunk/sysconfig/VERSION (original) +++ trunk/sysconfig/VERSION Mon May 28 07:21:56 2007 @@ -1 +1 @@ -2.15.2 +2.15.3 Modified: trunk/sysconfig/package/yast2-sysconfig.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/package/yast2-sysconfig.changes?rev=38151&r1=38150&r2=38151&view=diff ============================================================================== --- trunk/sysconfig/package/yast2-sysconfig.changes (original) +++ trunk/sysconfig/package/yast2-sysconfig.changes Mon May 28 07:21:56 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 28 07:16:57 CEST 2007 - lslezak@suse.cz + +- check UID after evaluating command line arguments (#269909) +- 2.15.3 + +------------------------------------------------------------------- Fri May 25 13:30:04 CEST 2007 - jsrain@suse.cz - removed outdated translations from .desktop-files (#271209) Modified: trunk/sysconfig/src/sysconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/sysconfig.ycp?rev=38151&r1=38150&r2=38151&view=diff ============================================================================== --- trunk/sysconfig/src/sysconfig.ycp (original) +++ trunk/sysconfig/src/sysconfig.ycp Mon May 28 07:21:56 2007 @@ -23,7 +23,6 @@ import "Sysconfig"; import "CommandLine"; -import "Confirm"; include "sysconfig/wizards.ycp"; include "sysconfig/cmdline.ycp"; @@ -97,11 +96,6 @@ ] ]; -if (!Confirm::MustBeRoot()) -{ - return (any)`abort; -} - /* main ui function */ any ret = CommandLine::Run(cmdline); Modified: trunk/sysconfig/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sysconfig/src/wizards.ycp?rev=38151&r1=38150&r2=38151&view=diff ============================================================================== --- trunk/sysconfig/src/wizards.ycp (original) +++ trunk/sysconfig/src/wizards.ycp Mon May 28 07:21:56 2007 @@ -17,6 +17,7 @@ import "Popup"; import "Label"; import "Sequencer"; +import "Confirm"; include "sysconfig/complex.ycp"; include "sysconfig/dialogs.ycp"; @@ -65,6 +66,17 @@ return ret; } +define symbol CheckRoot() +{ + if (!Confirm::MustBeRoot()) + { + return `abort; + } + + return `next; +} + + /** * Whole configuration of sysconfig * @return sequence result @@ -72,13 +84,18 @@ define boolean SysconfigSequence() ``{ map aliases = $[ + "check" : [ ``( CheckRoot() ), true ], "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainSequence() ), "write" : [ ``( WriteDialog() ), true ] ]; map sequence = $[ - "ws_start" : "read", + "ws_start" : "check", + "check" : $[ + `next : "read", + `abort : `abort + ], "read" : $[ `abort : `abort, `next : "main" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org