- correctly import sssd status (bnc#779010)

- 2.17.15

VERSION

@@ -1 +1 @@
-2.17.14
+2.17.15

package/yast2-kerberos-client.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep 13 10:47:53 CEST 2012 - jsuchome@suse.cz
+
+- correctly import sssd status (bnc#779010)
+- 2.17.15 
+
 -------------------------------------------------------------------
 Mon Feb  6 08:37:24 CET 2012 - jsuchome@suse.cz
 

src/Kerberos.ycp

@@ -155,7 +155,7 @@ global define boolean Import (map settings) ``{
     if (!haskey (ExpertSettings, "use_shmem") && haskey (client, "use_shmem"))
 	ExpertSettings["use_shmem"]	= use_shmem;
 
-    sssd		= settings["sssd"]:sssd;
+    sssd		= settings["pam_login", "sssd"]:sssd;
     pam_modified	= true;
     modified		= true;
     ssh_modified	= true;
@@ -774,13 +774,13 @@ global define list<string> UpdatedArchPackages (list<string> packages) {
  */
 global list<string> RequiredPackages () {
 
-    list<string> packages	= required_packages;
+    list<string> pkgs   = required_packages;
     // do not install pam_krb5 if sssd is configured
     if (sssd)
     {
-	packages	= filter (string p, packages, ``(p != "pam_krb5"));
+	pkgs    = filter (string p, pkgs, ``(p != "pam_krb5"));
     }
-    return packages;
+    return pkgs;
 }
 
 /**

testsuite/tests/ImportExport.out

@@ -0,0 +1,8 @@
+Return	true
+Return	$["kerberos_client":$["ExpertSettings":$[], "clockskew":"300", "default_domain":"", "default_realm":"", "forwardable":true, "ignore_unknown":true, "kdc_server":"", "minimum_uid":"1", "proxiable":false, "renew_lifetime":"1d", "ssh_support":false, "ticket_lifetime":"1d"], "pam_login":$["sssd":false, "use_kerberos":false]]
+Dump	
+Dump	sssd: false
+Return	true
+Return	$["kerberos_client":$["ExpertSettings":$[], "clockskew":"300", "default_domain":"", "default_realm":"", "forwardable":true, "ignore_unknown":true, "kdc_server":"", "minimum_uid":"1", "proxiable":false, "renew_lifetime":"1d", "ssh_support":false, "ticket_lifetime":"1d"], "pam_login":$["sssd":true, "use_kerberos":false]]
+Dump	
+Dump	sssd: true

testsuite/tests/ImportExport.ycp

@@ -0,0 +1,30 @@
+/**
+ *  Read.ycp
+ *  Test of Kerberos::Read function (whole read process, many config files)
+ *  Author:	Jiri Suchomel <jsuchome@suse.cz>
+ *  $Id$
+ */
+
+{
+
+    // testedfiles: Kerberos.ycp Pam.ycp
+    import "Testsuite";
+    import "Kerberos";
+
+
+    map data = $["kerberos_client":$["ExpertSettings":$[], "clockskew":"300", "default_domain":"", "default_realm":"", "forwardable":true, "ignore_unknown":true, "kdc_server":"", "minimum_uid":"1", "proxiable":false, "renew_lifetime":"1d", "ssh_support":false, "ticket_lifetime":"1d"], "pam_login":$["sssd":false, "use_kerberos":false]];
+
+    Testsuite::Test(``(Kerberos::Import (data)), [], 0);
+
+    Testsuite::Test(``(Kerberos::Export ()), [], 0);
+
+    Testsuite::Dump ( sformat ("\nsssd: %1", Kerberos::sssd) );
+
+    data["pam_login", "sssd"]   = true;
+
+    Testsuite::Test(``(Kerberos::Import (data)), [], 0);
+
+    Testsuite::Test(``(Kerberos::Export ()), [], 0);
+
+    Testsuite::Dump ( sformat ("\nsssd: %1", Kerberos::sssd) );
+}