From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 17 May 2008 09:22:00 +0000 (+0200)
Subject: ud-replicate: Also support the imposter dchroot-dsa from the debian archive [aba]
X-Git-Tag: userdir-ldap-0.3.24~9
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=611e526f755299a0ad88c163f5abf1e7106a1f70;hp=74d3791d33481944e3960dcda23842838ef3dcd3

ud-replicate: Also support the imposter dchroot-dsa from the debian archive [aba]
---

diff --git a/debian/changelog b/debian/changelog
index 2d1e0ff..8c2ebfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 userdir-ldap (0.3.XX) Xnstable; urgency=low
 
   * ud-mailgate: better regex for ssh1 keys, which we reject. [joerg, weasel]
+  * ud-replicate: Also support the imposter dchroot-dsa from the debian
+    archive. [aba, weasel]
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 17 May 2008 11:18:27 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sat, 17 May 2008 11:20:06 +0200
 
 userdir-ldap (0.3.23) unstable; urgency=low
 
diff --git a/ud-replicate b/ud-replicate
index 655b263..b745119 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -68,8 +68,13 @@ done
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
+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 [ -x "$c/usr/bin/makedb" ]
 		then