From: joey <>
Date: Thu, 18 Nov 2004 16:52:06 +0000 (+0000)
Subject: Removed support for the shadow file since we don't install it in the
X-Git-Tag: debian_userdir-ldap_0-3-7~4
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=df4932e87538cfb3d25f3db449f0f46aab751631

Removed support for the shadow file since we don't install it in the
chroot environment anymore.  Also remove such files if they exist in
the chroot environment.
---

diff --git a/ud-replicate b/ud-replicate
index 0ebb4f5..ed7f1d9 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -60,15 +60,14 @@ if [ -x /usr/bin/dchroot ]; then
 	for c in $CHROOTS; do
 		test -d "$c/var/lib/misc/HOST" || mkdir -p "$c/var/lib/misc/HOST"
 
-		rsync -ar ${verbose} $HOST/*.tdb $HOST/ssh* "$c/var/lib/misc/$HOST"
+		rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh* "$c/var/lib/misc/$HOST"
+
+		test -f "$c/var/lib/misc/$HOST/shadow.tdb" || rm -f "$c/var/lib/misc/$HOST/shadow.tdb"
+		test -f "$c/var/lib/misc/shadow.db" || rm -f "$c/var/lib/misc/shadow.db"
 
 			chroot "$c" makedb "/var/lib/misc/$HOST/passwd.tdb" -o /var/lib/misc/passwd.db.t
-			(umask 027 && chroot "$c" makedb "/var/lib/misc/$HOST/shadow.tdb" -o /var/lib/misc/shadow.db.t)
-			chown root.shadow "$c/var/lib/misc/shadow.db.t"
-			chmod 0640 "$c/var/lib/misc/shadow.db.t"
 			chroot "$c" makedb "/var/lib/misc/$HOST/group.tdb" -o /var/lib/misc/group.db.t
 			mv -f "$c/var/lib/misc/passwd.db.t" "$c/var/lib/misc/passwd.db"
-			mv -f "$c/var/lib/misc/shadow.db.t" "$c/var/lib/misc/shadow.db"
 			mv -f "$c/var/lib/misc/group.db.t" "$c/var/lib/misc/group.db"
 			ln -sf "$c/var/lib/misc/$HOST/ssh-rsa-shadow" "$c/var/lib/misc/"
 			ln -sf "$c/var/lib/misc/$HOST/ssh_known_hosts" "$c/var/lib/misc/"