X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-replicate;h=3f3921f66e6de3cef461d31d6c4debb0a33256b9;hb=29a64949fcfdee5b1fb6333037c78baf648827ed;hp=0ebb4f526924444f7e6c20a2c1ada55c80ee1c91;hpb=7a6dcc30460c5bfe4b55bcedbf865110bcc829b2;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-replicate b/ud-replicate
index 0ebb4f5..3f3921f 100755
--- a/ud-replicate
+++ b/ud-replicate
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-#   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@infodrom.org>
-#   Copyright (c) 2002-2003  Ryan Murray <rmurray@infodrom.org>
+#   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
+#   Copyright (c) 2002-2003  Ryan Murray <rmurray@debian.org>
 #   Copyright (c) 2004  Joey Schulze <joey@infodrom.org>
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@
 set -e
 
 # Without effect on the commandline
-if [ -z "$PS1" -o "$TERM" = "dumb" ]
+if [ -z "$TERM" -o "$TERM" = "dumb" ]
 then
     exec > /dev/null 2>&1
 else
@@ -54,24 +54,25 @@ mv -f shadow.db.t shadow.db
 mv -f group.db.t group.db
 ln -sf "$HOST/ssh-rsa-shadow" .
 ln -sf "$HOST/ssh_known_hosts" .
+ln -sf `pwd -P`/ssh-rsa-shadow /etc/ssh
+ln -sf `pwd -P`/ssh_known_hosts /etc/ssh
 
 if [ -x /usr/bin/dchroot ]; then
 	CHROOTS=`dchroot --listpaths`
 	for c in $CHROOTS; do
-		test -d "$c/var/lib/misc/HOST" || mkdir -p "$c/var/lib/misc/HOST"
+		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/"
+			ln -sf ../../var/lib/misc/ssh_known_hosts "$c/etc/ssh"
 	done
 fi