From d50247bd0ac0bf193b1f65a097e16af7b0ac87fa Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 15 Nov 2018 12:33:48 +0100
Subject: [PATCH] ud-replicate: remove chroot support

We no longer use historical dchroot.
---
 debian/changelog |  2 ++
 ud-replicate     | 47 -----------------------------------------------
 2 files changed, 2 insertions(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1fc8960..736ea09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ userdir-ldap (0.3.93) UNRELEASED; urgency=medium
   * UDLdap.py: more useful exception if our array assumptions are violated.
   * ud-guest-upgrade: do not add but replace privateSub.
   * Editorial edits to the salsa paragraph prepared by Joseph Herlant.
+  * ud-replicate: remove chroot support as we no longer use
+    historical dchroot.
 
   [ Ansgar Burchardt ]
   * ud-mailgate: include name of unknown host in error message
diff --git a/ud-replicate b/ud-replicate
index 23dc9fa..26158b9 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -110,53 +110,6 @@ if [ -e ${HOST}/web-passwords ]; then
 	chmod 0640 ${HOST}/web-passwords
 fi
 
-CHROOTS=""
-if [ -x /usr/bin/dchroot ]; then
-	CHROOTS=`dchroot --listpaths`
-elif [ -x /usr/bin/dchroot-dsa ]; then
-	CHROOTS=$(dchroot-dsa -i | grep Location | awk '{print $2}')
-fi
-if [ -n "$CHROOTS" ]; then
-	for c in $CHROOTS; do
-		if [ "$c" = "/" ] || [ "$c" = "" ]; then
-			echo "$0 WTF: \$c is '' or '/' here." 2>&1
-			exit 1
-		fi
-		if [ -x "$c/usr/bin/makedb" ]
-		then
-			mkdir -p "$c/var/lib/misc/$HOST"
-
-			# remove extra stuff from earlier times and so
-			find "$c/var/lib/misc/$HOST" -mindepth 1 \
-				! -name group.tdb -a \
-				! -name passwd.tdb -a \
-				! -name ssh_known_hosts \
-				-print0 | xargs --no-run-if-empty -0 rm -f
-			rsync -a ${verbose} $HOST/group.tdb $HOST/passwd.tdb $HOST/ssh_known_hosts "$c/var/lib/misc/$HOST"
-
-			# clean up from the times we supposedly did shadow stuff in chroots
-			rm -f "$c/var/lib/misc/shadow.db"
-
-			# from failed makedb runs earlier.
-			rm -f "$c/var/lib/misc/passwd.db.t" \
-			      "$c/var/lib/misc/group.db.t"
-			# build passwd information
-			chroot "$c" makedb "/var/lib/misc/$HOST/passwd.tdb" -o /var/lib/misc/passwd.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/group.db.t" "$c/var/lib/misc/group.db"
-
-			ln -sf "$HOST/ssh_known_hosts" "$c/var/lib/misc/"
-			if [ -d "$c/etc/ssh" ]; then
-				ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
-			elif [ -L "$c/etc/ssh" ] && [ "`readlink \"$c/etc/ssh\"`" = "../../var/lib/misc/ssh_known_hosts" ]; then
-				# clean up past mistakes
-				rm -f "$c/etc/ssh"
-			fi
-		fi
-	done
-fi
-
 if [ -d "/etc/exim4" -a -e "$HOST/bsmtp" ]; then
 	if perl -e 'exit !((stat "/etc/exim4/bsmtp")[9] < time()-3600)'; then
 		cp "$HOST/bsmtp" /etc/exim4/bsmtp
-- 
2.20.1