From 30d73bc48e425fd9ec8852e203420cca730eec98 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 15 Nov 2018 12:35:10 +0100
Subject: [PATCH] ud-replicate: manually remove __db.<foo>.db.t files before
 makedb calls.

---
 debian/changelog | 1 +
 ud-replicate     | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d1dbe62..abf6171 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ userdir-ldap (0.3.93) UNRELEASED; urgency=medium
   * ud-replicate: remove chroot support as we no longer use
     historical dchroot.
   * ud-replicate: move from lockfile(1) to flock.
+  * ud-replicate: manually remove __db.<foo>.db.t files before makedb calls.
 
   [ Ansgar Burchardt ]
   * ud-mailgate: include name of unknown host in error message
diff --git a/ud-replicate b/ud-replicate
index e06776c..53867e7 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -79,14 +79,17 @@ fi
 
 rsync ${verbose} --delete-after --times -e 'ssh -i /etc/ssh/ssh_host_rsa_key -o ControlPath=/var/run/.ud-replicate.ssh.socket -o ControlMaster=auto -o ControlPersist=2h -o BatchMode=yes' -rp "${udhost}/var/cache/userdir-ldap/hosts/$HOST" .
 
+rm -f __db.passwd.db.t
 makedb "$HOST/passwd.tdb" -o passwd.db.t
 if [ -s "$HOST/shadow.tdb" ]
 then
+    rm -f __db.shadow.db.t
     (umask 027 && makedb "$HOST/shadow.tdb" -o shadow.db.t)
     chown root.shadow shadow.db.t
     chmod 0640 shadow.db.t
     mv -f shadow.db.t shadow.db
 fi
+rm -f __db.group.db.t
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.db
 mv -f group.db.t group.db
-- 
2.20.1