- check UID after evaluating command line arguments (#269909)

- 2.15.3

svn path=/trunk/sysconfig/; revision=38151

VERSION

@@ -1 +1 @@
-2.15.2
+2.15.3

package/yast2-sysconfig.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

src/sysconfig.ycp

@@ -23,7 +23,6 @@ y2milestone ("Sysconfig module started");
 
 import "Sysconfig";
 import "CommandLine";
-import "Confirm";
 
 include "sysconfig/wizards.ycp";
 include "sysconfig/cmdline.ycp";
@@ -97,11 +96,6 @@ include "sysconfig/cmdline.ycp";
 	]
     ];
 
-if (!Confirm::MustBeRoot())
-{
-    return (any)`abort;
-}
-
 /* main ui function */
 any ret = CommandLine::Run(cmdline);
 

src/wizards.ycp

@@ -17,6 +17,7 @@ import "Sysconfig";
 import "Popup";
 import "Label";
 import "Sequencer";
+import "Confirm";
 
 include "sysconfig/complex.ycp";
 include "sysconfig/dialogs.ycp";
@@ -65,20 +66,36 @@ include "sysconfig/dialogs.ycp";
     return ret;
 }
 
+define symbol CheckRoot()
+{
+    if (!Confirm::MustBeRoot())
+    {
+	return `abort;
+    }
+
+    return `next;
+}
+
+
 /**
  * Whole configuration of sysconfig
  * @return sequence result
  */
  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"