diff -Nur e-smith-base-5.4.0/createlinks e-smith-base-5.4.0-rename_nss_ldap_conf/createlinks
--- e-smith-base-5.4.0/createlinks	2013-03-22 17:25:52.257769516 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/createlinks	2013-03-22 17:33:00.878484382 +0100
@@ -192,8 +192,8 @@
 	/etc/pam.d/system-auth
 	/etc/pam.d/passwd
 	/etc/pam.d/pwauth
-	/etc/ldap.conf
-	/etc/ldap.secret
+	/etc/pam_ldap.conf
+	/etc/pam_ldap.secret
 	/etc/security/pam_abl.conf
     ))
 {
@@ -580,3 +580,5 @@
 safe_symlink("/var/service/local" , 'root/service/local');
 safe_touch("root/var/service/local/down");
 
+# no template headers for /etc/pam_ldap.secret
+safe_touch("root/etc/e-smith/templates/etc/pam_ldap.secret/template-begin");
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/10ssl e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/10ssl
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/10ssl	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/10ssl	1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-ssl no
-
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/20pam_password e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/20pam_password
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/20pam_password	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/20pam_password	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-pam_password exop
-pam_filter	objectclass=posixAccount
-pam_login_attribute	uid
-pam_member_attribute	memberuid
-
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/30host e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/30host
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/30host	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/30host	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-host localhost
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40base e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40base
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40base	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40base	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-{
-    $OUT .= "base " . esmith::util::ldapBase ($DomainName);
-}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_group e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_group
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_group	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_group	1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-{
-    $OUT .= "nss_base_group ou=Groups,";
-    $OUT .= esmith::util::ldapBase ($DomainName);
-    $OUT .= "?one\n";
-}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_passwd e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_passwd
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_passwd	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_passwd	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-{
-    $OUT .= "nss_base_passwd ou=Users,";
-    $OUT .= esmith::util::ldapBase ($DomainName);
-    $OUT .= '?one';
-    $OUT .= "\n";
-    $OUT .= "nss_base_passwd ou=Computers,";
-    $OUT .= esmith::util::ldapBase ($DomainName);
-    $OUT .= '?one';
-    $OUT .= "\n";
-}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_shadow e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_shadow
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_shadow	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/40nss_base_shadow	1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-{
-    $OUT .= "nss_base_shadow ou=Users,";
-    $OUT .= esmith::util::ldapBase ($DomainName);
-    $OUT .= '?one';
-    $OUT .= "\n";
-    $OUT .= "nss_base_shadow ou=Computers,";
-    $OUT .= esmith::util::ldapBase ($DomainName);
-    $OUT .= '?one';
-    $OUT .= "\n";
-}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/45rootbinddn e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/45rootbinddn
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/45rootbinddn	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/45rootbinddn	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-{
-    $OUT .= "rootbinddn cn=root," . esmith::util::ldapBase ($DomainName);
-}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/55bind_policy e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/55bind_policy
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/55bind_policy	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/55bind_policy	1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-{
-# Allow read /etc/{passwd,groups,shadow} files when ldap is down.
-}
-bind_policy soft
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/60ignore_initgroups e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/60ignore_initgroups
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.conf/60ignore_initgroups	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.conf/60ignore_initgroups	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-nss_initgroups_ignoreusers root,ldap,named,avahi,haldaemon,dbus,radvd,tomcat,radiusd,news,mailman,nscd,gdm
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.secret/all e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.secret/all
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/ldap.secret/all	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/ldap.secret/all	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-{ esmith::util::LdapPassword (); }
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/10ssl e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/10ssl
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/10ssl	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/10ssl	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,2 @@
+ssl no
+
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/20pam_password e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/20pam_password
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/20pam_password	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/20pam_password	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,5 @@
+pam_password exop
+pam_filter	objectclass=posixAccount
+pam_login_attribute	uid
+pam_member_attribute	memberuid
+
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/30host e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/30host
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/30host	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/30host	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1 @@
+host localhost
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40base e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40base
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40base	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40base	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,3 @@
+{
+    $OUT .= "base " . esmith::util::ldapBase ($DomainName);
+}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_group e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_group
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_group	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_group	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,5 @@
+{
+    $OUT .= "nss_base_group ou=Groups,";
+    $OUT .= esmith::util::ldapBase ($DomainName);
+    $OUT .= "?one\n";
+}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_passwd e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_passwd
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_passwd	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_passwd	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,10 @@
+{
+    $OUT .= "nss_base_passwd ou=Users,";
+    $OUT .= esmith::util::ldapBase ($DomainName);
+    $OUT .= '?one';
+    $OUT .= "\n";
+    $OUT .= "nss_base_passwd ou=Computers,";
+    $OUT .= esmith::util::ldapBase ($DomainName);
+    $OUT .= '?one';
+    $OUT .= "\n";
+}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_shadow e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_shadow
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_shadow	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/40nss_base_shadow	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,10 @@
+{
+    $OUT .= "nss_base_shadow ou=Users,";
+    $OUT .= esmith::util::ldapBase ($DomainName);
+    $OUT .= '?one';
+    $OUT .= "\n";
+    $OUT .= "nss_base_shadow ou=Computers,";
+    $OUT .= esmith::util::ldapBase ($DomainName);
+    $OUT .= '?one';
+    $OUT .= "\n";
+}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/45rootbinddn e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/45rootbinddn
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/45rootbinddn	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/45rootbinddn	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,3 @@
+{
+    $OUT .= "rootbinddn cn=root," . esmith::util::ldapBase ($DomainName);
+}
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/55bind_policy e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/55bind_policy
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/55bind_policy	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/55bind_policy	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1,4 @@
+{
+# Allow read /etc/{passwd,groups,shadow} files when ldap is down.
+}
+bind_policy soft
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/60ignore_initgroups e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/60ignore_initgroups
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.conf/60ignore_initgroups	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.conf/60ignore_initgroups	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1 @@
+nss_initgroups_ignoreusers root,ldap,named,avahi,haldaemon,dbus,radvd,tomcat,radiusd,news,mailman,nscd,gdm
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.secret/all e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.secret/all
--- e-smith-base-5.4.0/root/etc/e-smith/templates/etc/pam_ldap.secret/all	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates/etc/pam_ldap.secret/all	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1 @@
+{ esmith::util::LdapPassword (); }
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/ldap.secret e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates.metadata/etc/ldap.secret
--- e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/ldap.secret	2013-01-31 16:52:03.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates.metadata/etc/ldap.secret	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-PERMS=0600
diff -Nur e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/pam_ldap.secret e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates.metadata/etc/pam_ldap.secret
--- e-smith-base-5.4.0/root/etc/e-smith/templates.metadata/etc/pam_ldap.secret	1970-01-01 01:00:00.000000000 +0100
+++ e-smith-base-5.4.0-rename_nss_ldap_conf/root/etc/e-smith/templates.metadata/etc/pam_ldap.secret	2013-01-31 16:52:03.000000000 +0100
@@ -0,0 +1 @@
+PERMS=0600