call new_cert_init after the password was set (bnc#899893, bnc#609449)

Conflicts: src/commandline.ycp
yast · Oct 13, 2014 · d8e7c07 · d8e7c07
1 parent e9d3657
commit d8e7c07
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/commandline.ycp b/src/commandline.ycp
@@ -60,6 +60,15 @@
 	CaMgm::CAName = options["caname"]:"";
 	CaMgm::currentCA = options["caname"]:"";
 
+	if (haskey (options, "capasswd"))
+	{
+	    CaMgm::passwdMap[CaMgm::CAName] = options["capasswd"]:"";
+	}
+	else
+	{
+	    CaMgm::passwdMap[CaMgm::CAName] = strip(getenv("capasswd"));
+	}
+
 	if (options["type"]:"" == "client")
 	{
 	    new_cert_init ("Client Certificate");
@@ -93,15 +102,6 @@
 	    CaMgm::password = strip(getenv("keyPasswd"));
 	}
 
-	if (haskey (options, "capasswd"))
-	{
-	    CaMgm::passwdMap[CaMgm::CAName] = options["capasswd"]:"";
-	}
-	else
-	{
-	    CaMgm::passwdMap[CaMgm::CAName] = strip(getenv("capasswd"));
-	}
-
 	boolean ret = true;
 	if (options["kind"]:"" == "client")
 	{