[debian-edu-commits] debian-edu/ 01/01: cf/cf.ldapclient: remove another unused workaround.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit 107d6b055d7a0472cd0a4f0507b51adae505fd8b
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue May 31 11:29:59 2016 +0200

    cf/cf.ldapclient: remove another unused workaround.
---
 cf/cf.ldapclient | 5 -----
 debian/changelog | 7 +++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cf/cf.ldapclient b/cf/cf.ldapclient
index e604157..31d9505 100644
--- a/cf/cf.ldapclient
+++ b/cf/cf.ldapclient
@@ -44,11 +44,6 @@ editfiles:
 
     debian.installation.!standalone::
 
-#	## Avoid showing the GOsa template as user:
-#    	{ /etc/nslcd.conf
-#          AppendIfNoSuchLine "filter passwd (&(objectClass=posixAccount)(!(objectClass=gosaUserTemplate)))"
-#        }
-
 	{ /etc/ldap/ldap.conf
           BeginGroupIfNoLineMatching "^HOST .*"
             AppendIfNoSuchLine "HOST $(ldapserver)"
diff --git a/debian/changelog b/debian/changelog
index 677c1be..d3a79d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ debian-edu-config (1.904) UNRELEASED; urgency=medium
     for automatic printer detection.
 
   [ Holger Levsen ]
-  * cf/cf.ldapclient: remove workaround for #706434 (purging winbind) which is
-    fixed since Jessie.
+  * cf/cf.ldapclient:
+    - remove workaround for #706434 (purging winbind) which is fixed since
+      Jessie.
+    - remove workaround (which was commented out and not used even in Jessie)
+      modifying /etc/nslcd.conf.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 30 May 2016 16:32:50 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git