- disable nscd caching when sssd is used (bnc#772944)

yast · Oct 11, 2012 · 4c829a3 · 4c829a3
1 parent 2fde1d4
commit 4c829a3
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.23.0
+2.23.1
diff --git a/agents/Makefile.am b/agents/Makefile.am
@@ -5,7 +5,8 @@
 #
 
 scrconf_DATA = ldap_conf.scr    \
-	       cfg_ldap.scr
+	       cfg_ldap.scr     \
+               nscd_conf.scr
 
 fillup_DATA = sysconfig.ldap
 

diff --git a/package/yast2-ldap-client.changes b/package/yast2-ldap-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 11 10:31:53 CEST 2012 - jsuchome@suse.cz
+
+- disable nscd caching when sssd is used (bnc#772944)
+- 2.23.1 
+
 -------------------------------------------------------------------
 Wed Oct 10 15:19:26 CEST 2012 - jsuchome@suse.cz
 

diff --git a/src/Ldap.ycp b/src/Ldap.ycp
@@ -2651,6 +2651,29 @@ Select another one.
 	return nds;
     }
 
+    /**
+    * Adpat passwd and group cache in /etc/nscd.conf
+    * Caching should be disabled with sssd on
+    * @param start_sssd if sssd will be started
+    */
+    boolean WriteNscdCache (boolean start_sssd) {
+
+      list<string> enable_cache	= (list<string>) SCR::Read (.etc.nscd_conf.v.enable-cache);
+      enable_cache        = maplist (string sect, enable_cache, {
+        list<string> l = filter (string part, splitstring (sect, " \t"), ``(part != ""));
+        if (l[0]:"" == "passwd" || l[0]:"" == "group")
+        {
+          return sformat ("%1\t\t%2", l[0]:"", start_sssd ? "no": "yes");
+        }
+        return sect;
+      });
+      if (enable_cache == [] || enable_cache == nil)
+      {
+        return false;
+      }
+      return SCR::Write (.etc.nscd_conf.v.enable-cache, enable_cache);
+    }
+
     /**
      * Saves LDAP configuration.
      * @param abort block for abort
@@ -2777,6 +2800,7 @@ Select another one.
 
 	    // default value is 'yes'
 	    WriteLdapConfEntry ("tls_checkpeer", tls_checkpeer == "yes" ? nil : tls_checkpeer);
+	    WriteNscdCache (start && sssd);
 	}
 	if (start) // ldap used for authentocation
 	{