X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=1a0ca55b5aebf321940dd6d21201ff8294ac5447;hb=dc2644ca6761003bc2ede1d8c92235096b11c6fb;hp=fc81a4507c170cdf00394772c3e62cb7a9a9ad9f;hpb=566b90f55eb6ebbede83ae9ac8ed6d466bc19ec3;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index fc81a45..1a0ca55 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 #   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
-#   Copyright (c) 2002-2003  Ryan Murray <rmurray@debian.org>
+#   Copyright (c) 2002-2003,2006  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2004-2005  Joey Schulze <joey@infodrom.org>
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,8 @@ else
     verbose=-v
 fi
 
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+export PATH
 HOST=`hostname -f`
 cd /tmp/
 cd /var/lib/misc || cd /var/state/glibc/ || cd /var/db/
@@ -39,7 +41,7 @@ case $HOST in
     udhost=
     ;;
 *)
-    udhost="sshdist@samosa:"
+    udhost="sshdist@db:"
     ;;
 esac
 
@@ -56,8 +58,9 @@ fi
 makedb "$HOST/group.tdb" -o group.db.t
 mv -f passwd.db.t passwd.db
 mv -f group.db.t group.db
-ln -sf "$HOST/ssh-rsa-shadow" .
-ln -sf "$HOST/ssh_known_hosts" .
+for a in $HOST/ssh-rsa-shadow $HOST/ssh_known_hosts; do
+	ln -sf $a .
+done
 ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
 ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
@@ -78,15 +81,15 @@ if [ -x /usr/bin/dchroot ]; then
 			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 "$c/var/lib/misc/$HOST/ssh_known_hosts" "$c/var/lib/misc/"
+			ln -sf "$HOST/ssh_known_hosts" "$c/var/lib/misc/"
 			ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
 		fi
 	done
 fi
 
-if [ -d "/etc/exim" -a -e "$HOST/bsmtp" ]; then
-	if perl -e 'exit !((stat "/etc/exim/bsmtp")[9] < time()-3600)'; then
-		cp "$HOST/bsmtp" /etc/exim/bsmtp
+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
 	fi
 fi
 if [ -d "/etc/postfix" -a -f "$HOST/forward-alias" ]; then